Fix #33405: preview render getting stuck in a particular .blend file, ObjectKey
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 4 Dec 2012 07:48:09 +0000 (07:48 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Tue, 4 Dec 2012 07:48:09 +0000 (07:48 +0000)
commita9d889cba412eaa4e02806e50b631ae621521e23
tree4ce11445d1b30caa567f6c8fb6dd70fdffb2fc85
parentc0078a987978348f200322764e06afbcc378b81f
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().
intern/cycles/blender/blender_shader.cpp
intern/cycles/blender/blender_util.h
intern/cycles/kernel/kernel_shader.h
intern/cycles/render/mesh.cpp
intern/cycles/render/osl.h
intern/cycles/render/scene.cpp
intern/cycles/render/shader.cpp
intern/cycles/render/shader.h