Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor

Browse Source

Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl

...

This commit is contained in:

Emil Axelsson

2017-03-07 10:57:50 +01:00

parent 4751ce36c4 dcc9d6228d

commit 7da999c332

867 changed files with 13415 additions and 8810 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

888

src/engine/openspaceengine.cpp

File diff suppressed because it is too large Load Diff