forked from bartvdbraak/blender
a42ba82f63
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. |
||
---|---|---|
.. | ||
doc | ||
intern | ||
test | ||
CMakeLists.txt | ||
GHOST_C-api.h | ||
GHOST_IEvent.h | ||
GHOST_IEventConsumer.h | ||
GHOST_ISystem.h | ||
GHOST_ISystemPaths.h | ||
GHOST_ITimerTask.h | ||
GHOST_IWindow.h | ||
GHOST_Path-api.h | ||
GHOST_Rect.h | ||
GHOST_Types.h | ||
SConscript |