Commit Graph

4 Commits

Author SHA1 Message Date
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
Campbell Barton
f807c2a04c rename raskter kdtree files to be less generic 2012-07-10 06:47:21 +00:00
Peter Larabell
689403bf57 updating raskter to support tiles compositor. this commit puts in some groundwork code to support tiles's pixel processor 2012-07-09 22:57:23 +00:00
Campbell Barton
a3f855f35d raskter rasterizer by Pete Larabell, from tomato branch 2012-06-04 15:38:55 +00:00