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

Fix #35696: cycles crash with no world assigned to scene, after recent changes.

Browse Source
This commit is contained in:
Brecht Van Lommel 2013-06-09 18:05:53 +00:00
parent 860fce4eb9
commit 28add50083
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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);