sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #32972: cycles crash switching OSL to SVM in viewport render.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-10-26 09:25:02 +00:00
parent c04b3df1af
commit d19894c8cb
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
intern/cycles/blender/blender_sync.cpp
View File

@ -397,7 +397,15 @@ SessionParams BlenderSync::get_session_params(BL::RenderEngine b_engine, BL::Use
}
else
params.progressive = true;
/* shading system - scene level needs full refresh */
int shadingsystem = RNA_enum_get(&cscene, "shading_system");
if(shadingsystem == 0)
params.shadingsystem = SessionParams::SVM;
else if(shadingsystem == 1)
params.shadingsystem = SessionParams::OSL;
return params;
}

7
intern/cycles/render/session.h
View File

@ -57,6 +57,8 @@ public:
double reset_timeout;
double text_timeout;
enum { OSL, SVM } shadingsystem;
SessionParams()
{
background = false;
@ -73,6 +75,8 @@ public:
cancel_timeout = 0.1;
reset_timeout = 0.1;
text_timeout = 1.0;
shadingsystem = SVM;
}
bool modified(const SessionParams& params)
@ -89,7 +93,8 @@ public:
&& threads == params.threads
&& cancel_timeout == params.cancel_timeout
&& reset_timeout == params.reset_timeout
&& text_timeout == params.text_timeout); }
&& text_timeout == params.text_timeout
&& shadingsystem == params.shadingsystem); }
};