forked from bartvdbraak/blender
Fix #35696: cycles crash with no world assigned to scene, after recent changes.
This commit is contained in:
parent
860fce4eb9
commit
28add50083
@ -211,7 +211,6 @@ void BlenderSync::sync_integrator()
|
|||||||
void BlenderSync::sync_film()
|
void BlenderSync::sync_film()
|
||||||
{
|
{
|
||||||
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
|
PointerRNA cscene = RNA_pointer_get(&b_scene.ptr, "cycles");
|
||||||
BL::WorldMistSettings b_mist = b_scene.world().mist_settings();
|
|
||||||
|
|
||||||
Film *film = scene->film;
|
Film *film = scene->film;
|
||||||
Film prevfilm = *film;
|
Film prevfilm = *film;
|
||||||
@ -220,6 +219,9 @@ void BlenderSync::sync_film()
|
|||||||
film->filter_type = (FilterType)RNA_enum_get(&cscene, "filter_type");
|
film->filter_type = (FilterType)RNA_enum_get(&cscene, "filter_type");
|
||||||
film->filter_width = (film->filter_type == FILTER_BOX)? 1.0f: get_float(cscene, "filter_width");
|
film->filter_width = (film->filter_type == FILTER_BOX)? 1.0f: get_float(cscene, "filter_width");
|
||||||
|
|
||||||
|
if(b_scene.world()) {
|
||||||
|
BL::WorldMistSettings b_mist = b_scene.world().mist_settings();
|
||||||
|
|
||||||
film->mist_start = b_mist.start();
|
film->mist_start = b_mist.start();
|
||||||
film->mist_depth = b_mist.depth();
|
film->mist_depth = b_mist.depth();
|
||||||
|
|
||||||
@ -234,6 +236,7 @@ void BlenderSync::sync_film()
|
|||||||
film->mist_falloff = 0.5f;
|
film->mist_falloff = 0.5f;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if(film->modified(prevfilm))
|
if(film->modified(prevfilm))
|
||||||
film->tag_update(scene);
|
film->tag_update(scene);
|
||||||
|
Loading…
Reference in New Issue
Block a user