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

Fix: cycles not supporting scene background sets.

Browse Source
This commit is contained in:
Brecht Van Lommel 2012-05-23 09:46:33 +00:00
parent 88fc573596
commit f8481fed47
2 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,8 +285,10 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
/* object loop */ /* object loop */
BL::Scene::objects_iterator b_ob; BL::Scene::objects_iterator b_ob;
BL::Scene b_sce = b_scene;
for(b_scene.objects.begin(b_ob); b_ob != b_scene.objects.end(); ++b_ob) { for(; b_sce; b_sce = b_sce.background_set()) {
for(b_sce.objects.begin(b_ob); b_ob != b_sce.objects.end(); ++b_ob) {
bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render(); bool hide = (render_layer.use_viewport_visibility)? b_ob->hide(): b_ob->hide_render();
uint ob_layer = get_layer(b_ob->layers()); uint ob_layer = get_layer(b_ob->layers());
@ -334,6 +336,7 @@ void BlenderSync::sync_objects(BL::SpaceView3D b_v3d, int motion)
} }
} }
} }
}
if(!motion) { if(!motion) {
sync_background_light(); sync_background_light();

2
source/blender/makesrna/intern/rna_scene.c
View File

@ -4214,7 +4214,7 @@ void RNA_def_scene(BlenderRNA *brna)
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_SELF_CHECK);
RNA_def_property_pointer_funcs(prop, NULL, "rna_Scene_set_set", NULL, NULL); RNA_def_property_pointer_funcs(prop, NULL, "rna_Scene_set_set", NULL, NULL);
RNA_def_property_ui_text(prop, "Background Scene", "Background set scene"); RNA_def_property_ui_text(prop, "Background Scene", "Background set scene");
RNA_def_property_update(prop, NC_SCENE | NA_EDITED, NULL); RNA_def_property_update(prop, NC_SCENE | NA_EDITED, "rna_Scene_glsl_update");
prop = RNA_def_property(srna, "world", PROP_POINTER, PROP_NONE); prop = RNA_def_property(srna, "world", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_EDITABLE); RNA_def_property_flag(prop, PROP_EDITABLE);