diff options
Diffstat (limited to 'intern/cycles/blender/blender_shader.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_shader.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/intern/cycles/blender/blender_shader.cpp b/intern/cycles/blender/blender_shader.cpp index 50a95777a0f..94c7aa3b248 100644 --- a/intern/cycles/blender/blender_shader.cpp +++ b/intern/cycles/blender/blender_shader.cpp @@ -235,7 +235,7 @@ static ShaderNode *add_node(Scene *scene, BL::RenderEngine& b_engine, BL::BlendData& b_data, BL::Scene& b_scene, - BL::SceneLayer b_scene_layer, + BL::ViewLayer b_view_layer, const bool background, ShaderGraph *graph, BL::ShaderNodeTree& b_ntree, @@ -832,7 +832,7 @@ static ShaderNode *add_node(Scene *scene, /* TODO(sergey): Use more proper update flag. */ if(true) { - b_point_density_node.cache_point_density(b_scene, b_scene_layer, settings); + b_point_density_node.cache_point_density(b_scene, b_view_layer, settings); scene->image_manager->tag_reload_image( point_density->filename.string(), point_density->builtin_data, @@ -850,7 +850,7 @@ static ShaderNode *add_node(Scene *scene, BL::Object b_ob(b_point_density_node.object()); if(b_ob) { float3 loc, size; - point_density_texture_space(b_scene, b_scene_layer, + point_density_texture_space(b_scene, b_view_layer, b_point_density_node, settings, loc, @@ -978,7 +978,7 @@ static void add_nodes(Scene *scene, BL::RenderEngine& b_engine, BL::BlendData& b_data, BL::Scene& b_scene, - BL::SceneLayer& b_scene_layer, + BL::ViewLayer& b_view_layer, const bool background, ShaderGraph *graph, BL::ShaderNodeTree& b_ntree, @@ -1053,7 +1053,7 @@ static void add_nodes(Scene *scene, b_engine, b_data, b_scene, - b_scene_layer, + b_view_layer, background, graph, b_group_ntree, @@ -1101,7 +1101,7 @@ static void add_nodes(Scene *scene, b_engine, b_data, b_scene, - b_scene_layer, + b_view_layer, background, graph, b_ntree, @@ -1165,7 +1165,7 @@ static void add_nodes(Scene *scene, BL::RenderEngine& b_engine, BL::BlendData& b_data, BL::Scene& b_scene, - BL::SceneLayer& b_scene_layer, + BL::ViewLayer& b_view_layer, const bool background, ShaderGraph *graph, BL::ShaderNodeTree& b_ntree) @@ -1175,7 +1175,7 @@ static void add_nodes(Scene *scene, b_engine, b_data, b_scene, - b_scene_layer, + b_view_layer, background, graph, b_ntree, @@ -1214,7 +1214,7 @@ void BlenderSync::sync_materials(bool update_all) if(b_mat->use_nodes() && b_mat->node_tree()) { BL::ShaderNodeTree b_ntree(b_mat->node_tree()); - add_nodes(scene, b_engine, b_data, b_scene, b_scene_layer, !preview, graph, b_ntree); + add_nodes(scene, b_engine, b_data, b_scene, b_view_layer, !preview, graph, b_ntree); } else { DiffuseBsdfNode *diffuse = new DiffuseBsdfNode(); @@ -1285,7 +1285,7 @@ void BlenderSync::sync_world(bool update_all) if(b_world && b_world.use_nodes() && b_world.node_tree()) { BL::ShaderNodeTree b_ntree(b_world.node_tree()); - add_nodes(scene, b_engine, b_data, b_scene, b_scene_layer, !preview, graph, b_ntree); + add_nodes(scene, b_engine, b_data, b_scene, b_view_layer, !preview, graph, b_ntree); /* volume */ PointerRNA cworld = RNA_pointer_get(&b_world.ptr, "cycles"); @@ -1344,8 +1344,8 @@ void BlenderSync::sync_world(bool update_all) else background->transparent = b_scene.render().alpha_mode() == BL::RenderSettings::alpha_mode_TRANSPARENT; - background->use_shader = render_layer.use_background_shader; - background->use_ao = background->use_ao && render_layer.use_background_ao; + background->use_shader = view_layer.use_background_shader; + background->use_ao = background->use_ao && view_layer.use_background_ao; if(background->modified(prevbackground)) background->tag_update(scene); @@ -1378,7 +1378,7 @@ void BlenderSync::sync_lamps(bool update_all) BL::ShaderNodeTree b_ntree(b_lamp->node_tree()); - add_nodes(scene, b_engine, b_data, b_scene, b_scene_layer, !preview, graph, b_ntree); + add_nodes(scene, b_engine, b_data, b_scene, b_view_layer, !preview, graph, b_ntree); } else { float strength = 1.0f; |