forked from bartvdbraak/blender
Fix #32972: cycles crash switching OSL to SVM in viewport render.
This commit is contained in:
parent
c04b3df1af
commit
d19894c8cb
@ -398,6 +398,14 @@ 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;
|
||||
}
|
||||
|
||||
|
@ -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); }
|
||||
|
||||
};
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user