Blender Git Loki
Git Commits -> Revision a9d889c
Revision a9d889c by Brecht Van Lommel (master) December 4, 2012, 07:48 (GMT) |
Fix #33405: preview render getting stuck in a particular .blend file, ObjectKey operator< had wrong brackets, changed it now to be more clear. Fix #33404: crash GPU rendering with OSL option still enabled. There was a check to disable OSL in this case, but it shouldn't have modified scene->params because this is used for comparison in scene->modified(). |
Commit Details:
Full Hash: a9d889cba412eaa4e02806e50b631ae621521e23
SVN Revision: 52760
Parent Commit: c0078a9
Lines Changed: +35, -16
8 Modified Paths:
/intern/cycles/blender/blender_shader.cpp (+1, -1) (Diff)
/intern/cycles/blender/blender_util.h (+19, -5) (Diff)
/intern/cycles/kernel/kernel_shader.h (+1, -1) (Diff)
/intern/cycles/render/mesh.cpp (+1, -1) (Diff)
/intern/cycles/render/osl.h (+2, -0) (Diff)
/intern/cycles/render/scene.cpp (+6, -5) (Diff)
/intern/cycles/render/shader.cpp (+2, -2) (Diff)
/intern/cycles/render/shader.h (+3, -1) (Diff)
/intern/cycles/blender/blender_util.h (+19, -5) (Diff)
/intern/cycles/kernel/kernel_shader.h (+1, -1) (Diff)
/intern/cycles/render/mesh.cpp (+1, -1) (Diff)
/intern/cycles/render/osl.h (+2, -0) (Diff)
/intern/cycles/render/scene.cpp (+6, -5) (Diff)
/intern/cycles/render/shader.cpp (+2, -2) (Diff)
/intern/cycles/render/shader.h (+3, -1) (Diff)