cc9cii 312b7cd571 Merge branch 'master' into QtOGre ... Conflicts: apps/opencs/model/doc/document.cpp apps/opencs/view/render/pagedworldspacewidget.cpp apps/opencs/view/render/pagedworldspacewidget.hpp components/nif/niffile.hpp libs/openengine/bullet/physic.hpp		2014-09-30 10:52:04 +10:00
..
OgreGpuProgram.cpp	compile fixes	2014-07-22 11:49:45 +02:00
OgreGpuProgram.hpp	adding shiny	2012-11-06 19:09:44 +01:00
OgreMaterial.cpp	unloadUnreferencedMaterials: Properly unload materials instead of removing techniques	2014-08-18 19:23:16 +02:00
OgreMaterial.hpp	unloadUnreferencedMaterials: Properly unload materials instead of removing techniques	2014-08-18 19:23:16 +02:00
OgreMaterialSerializer.cpp	Fix normal maps with spaces in filename not getting loaded	2013-04-12 04:36:28 +02:00
OgreMaterialSerializer.hpp	adding shiny	2012-11-06 19:09:44 +01:00
OgrePass.cpp	Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)	2013-05-03 13:55:57 +02:00
OgrePass.hpp	Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)	2013-05-03 13:55:57 +02:00
OgrePlatform.cpp	Sync upstream changes to shiny	2014-08-06 20:13:58 +02:00
OgrePlatform.hpp	Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)	2013-05-03 13:55:57 +02:00
OgreTextureUnitState.cpp	Include some more required Ogre headers explicitely.	2014-03-05 21:46:37 +01:00
OgreTextureUnitState.hpp	Sync extern/shiny, set memory budgets for texture and mesh managers (however this has no effect yet and depends on changes in Ogre being made)	2013-05-03 13:55:57 +02:00