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. |
||
---|---|---|
.. | ||
intern | ||
CMakeLists.txt | ||
MEM_Allocator.h | ||
MEM_CacheLimiter.h | ||
MEM_CacheLimiterC-Api.h | ||
MEM_NonCopyable.h | ||
MEM_RefCounted.h | ||
MEM_RefCountedC-Api.h | ||
MEM_RefCountPtr.h | ||
MEM_SmartPtr.h | ||
SConscript |