sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
a42ba82f63
blender/intern/ghost
History
Tamito Kajiyama a42ba82f63 Merged changes in the trunk up to revision 50829. 
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c

Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material).  OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
2012-09-23 18:50:56 +00:00
..
doc This commit fixes up a bunch of svn properties to hopefully make things a little nicer for everyone. 2007-08-28 10:07:08 +00:00
intern Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
test Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
CMakeLists.txt fix for building blender as a python module on windows. 2012-06-15 20:59:00 +00:00
GHOST_C-api.h Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
GHOST_IEvent.h code clenup: comments and some style edits on ghost/osx (odd indentation) 2012-09-06 02:10:09 +00:00
GHOST_IEventConsumer.h code clenup: comments and some style edits on ghost/osx (odd indentation) 2012-09-06 02:10:09 +00:00
GHOST_ISystem.h code clenup: comments and some style edits on ghost/osx (odd indentation) 2012-09-06 02:10:09 +00:00
GHOST_ISystemPaths.h code clenup: comments and some style edits on ghost/osx (odd indentation) 2012-09-06 02:10:09 +00:00
GHOST_ITimerTask.h code clenup: comments and some style edits on ghost/osx (odd indentation) 2012-09-06 02:10:09 +00:00
GHOST_IWindow.h Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
GHOST_Path-api.h code clenup: comments and some style edits on ghost/osx (odd indentation) 2012-09-06 02:10:09 +00:00
GHOST_Rect.h Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
GHOST_Types.h code clenup: comments and some style edits on ghost/osx (odd indentation) 2012-09-06 02:10:09 +00:00
SConscript Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications. 2012-04-24 12:57:58 +00:00