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().
This commit is contained in:
@@ -121,12 +121,12 @@ ShaderManager::~ShaderManager()
|
||||
{
|
||||
}
|
||||
|
||||
ShaderManager *ShaderManager::create(Scene *scene)
|
||||
ShaderManager *ShaderManager::create(Scene *scene, int shadingsystem)
|
||||
{
|
||||
ShaderManager *manager;
|
||||
|
||||
#ifdef WITH_OSL
|
||||
if(scene->params.shadingsystem == SceneParams::OSL)
|
||||
if(shadingsystem == SceneParams::OSL)
|
||||
manager = new OSLShaderManager();
|
||||
else
|
||||
#endif
|
||||
|
Reference in New Issue
Block a user