sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity
a42ba82f63
blender/intern
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
..
audaspace Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
bsp Code cleanup: 2012-08-04 11:42:38 +00:00
container style cleanup 2012-08-11 22:12:32 +00:00
cycles Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
decimation style cleanup 2012-07-21 22:58:08 +00:00
dualcon Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
elbeem Fix compile errors on VC++ 2012 RC1. 2012-07-27 18:18:13 +00:00
ffmpeg Use own version of ff_update_cur_dts for FFmpeg >= 0.11, seems 2012-06-25 07:14:21 +00:00
ghost Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
guardedalloc Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
iksolver Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
itasc Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
memutil Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
mikktspace Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
moto Cycles: svn merge -r41225:41232 ^/trunk/blender 2011-10-24 22:32:00 +00:00
opencolorio Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
opennl Fix #32402: live unwrap memory leak, more noticeable if you have many UV's pinned. 2012-08-30 17:42:08 +00:00
raskter Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
smoke Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
string Merged changes in the trunk up to revision 50829. 2012-09-23 18:50:56 +00:00
utfconv code cleanup: quiet some windows warnings. 2012-09-15 04:57:51 +00:00
CMakeLists.txt Color Management, Stage 1: Initial OpenColorIO library integration 2012-09-15 10:03:17 +00:00
SConscript Color Management, Stage 1: Initial OpenColorIO library integration 2012-09-15 10:03:17 +00:00