Blender Git Commit Log
Git Commits -> Revision 1bb2892
Revision 1bb2892 by Thomas Dinges (soc-2013-dingto) September 9, 2013, 00:22 (GMT) |
Branch maintenance: * Revert r59183 and r57612 of my branch. Those changes were experimental. In case we need it, it's still in SVN history. * Also fix a mismatch in gpu_shader_material.glsl. Trunk and my branch are now equal, except splash.png. Compared with Meld, thanks to Campbell for the suggestion. :) |
Commit Details:
Full Hash: 1bb28925627f3be4dade4de1e569e54c4e24c438
SVN Revision: 59932
Parent Commit: fc8fa15
Lines Changed: +13, -191
16 Modified Paths:
/intern/cycles/blender/addon/properties.py (+0, -25) (Diff)
/intern/cycles/blender/addon/ui.py (+0, -20) (Diff)
/intern/cycles/blender/blender_object.cpp (+2, -6) (Diff)
/intern/cycles/device/device.h (+0, -2) (Diff)
/intern/cycles/device/device_cpu.cpp (+0, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+0, -1) (Diff)
/intern/cycles/device/device_multi.cpp (+0, -2) (Diff)
/intern/cycles/kernel/kernel_textures.h (+0, -55) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+0, -54) (Diff)
/intern/cycles/render/image.cpp (+4, -9) (Diff)
/intern/cycles/render/image.h (+2, -6) (Diff)
/intern/cycles/render/object.cpp (+0, -1) (Diff)
/intern/cycles/render/object.h (+0, -2) (Diff)
/intern/cycles/render/scene.cpp (+2, -2) (Diff)
/intern/cycles/render/scene.h (+2, -2) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+1, -3) (Diff)
/intern/cycles/blender/addon/ui.py (+0, -20) (Diff)
/intern/cycles/blender/blender_object.cpp (+2, -6) (Diff)
/intern/cycles/device/device.h (+0, -2) (Diff)
/intern/cycles/device/device_cpu.cpp (+0, -1) (Diff)
/intern/cycles/device/device_cuda.cpp (+0, -1) (Diff)
/intern/cycles/device/device_multi.cpp (+0, -2) (Diff)
/intern/cycles/kernel/kernel_textures.h (+0, -55) (Diff)
/intern/cycles/kernel/svm/svm_image.h (+0, -54) (Diff)
/intern/cycles/render/image.cpp (+4, -9) (Diff)
/intern/cycles/render/image.h (+2, -6) (Diff)
/intern/cycles/render/object.cpp (+0, -1) (Diff)
/intern/cycles/render/object.h (+0, -2) (Diff)
/intern/cycles/render/scene.cpp (+2, -2) (Diff)
/intern/cycles/render/scene.h (+2, -2) (Diff)
/source/blender/gpu/shaders/gpu_shader_material.glsl (+1, -3) (Diff)