Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
a45919f8
Commit
a45919f8
authored
Feb 09, 2018
by
schultz
Browse files
Merge branch 'master' into unstable
parents
adb3dc11
2e10ee32
Changes
4
Hide whitespace changes
Inline
Side-by-side
Documentation/DeveloperHelpSources/changelog.docu
View file @
a45919f8
...
...
@@ -9,6 +9,8 @@
- Queued cross plugin interconnection feature
- Use QOpenGLWidget
- Switched to Qt command line parsing and removed SimpleOpt
- Fix clang warning by avoiding GNU extension
- Do not automatically save file immediately after loading with ctrl-o
- <b>ACG</b>
- Clamp shininess in Materialnode (caused GL Errors)
- Better Material support in Materialnode (emissive and refractive materials)
...
...
libs_required/ACG/GL/globjects.hh
View file @
a45919f8
...
...
@@ -151,7 +151,7 @@ public:
char
*
offset
(
unsigned
int
_offset
)
const
{
return
((
char
*
)
NULL
+
_offset
);
return
reinterpret_cast
<
char
*>
(
_offset
);
}
GLuint
id
()
const
{
return
vbo
;}
...
...
widgets/coreWidget/CoreWidget.cc
View file @
a45919f8
...
...
@@ -950,7 +950,11 @@ CoreWidget::updateRecent()
}
}
// Workaround for QMenu issue on MacOS: https://bugreports.qt.io/browse/QTBUG-63848
// Without this, the recent files menu entries are all disabled after using the menu once:
// https://www.graphics.rwth-aachen.de:9000/OpenFlipper-Free/OpenFlipper-Free/issues/139
recentFilesMenu_
->
setEnabled
(
false
);
recentFilesMenu_
->
setEnabled
(
true
);
}
void
...
...
widgets/coreWidget/keyHandling.cc
View file @
a45919f8
...
...
@@ -605,6 +605,7 @@ void CoreWidget::coreKeyPressEvent (QKeyEvent* _e){
case
Qt
::
Key_O
:
loadMenu
();
return
;
case
Qt
::
Key_S
:
saveMenu
();
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment