diff options
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_preview.c | 16 | ||||
-rw-r--r-- | source/blender/editors/render/render_shading.c | 4 | ||||
-rw-r--r-- | source/blender/editors/render/render_update.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index dd5b97a68ed..948e272eca0 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -378,8 +378,8 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre sce->lay = 1 << mat->pr_type; if (mat->nodetree && sp->pr_method == PR_NODE_RENDER) { /* two previews, they get copied by wmJob */ - ntreeInitPreview(mat->nodetree, sp->sizex, sp->sizey); - ntreeInitPreview(origmat->nodetree, sp->sizex, sp->sizey); + BKE_node_preview_init_tree(mat->nodetree, sp->sizex, sp->sizey, TRUE); + BKE_node_preview_init_tree(origmat->nodetree, sp->sizex, sp->sizey, TRUE); } } } @@ -442,8 +442,8 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre if (tex && tex->nodetree && sp->pr_method == PR_NODE_RENDER) { /* two previews, they get copied by wmJob */ - ntreeInitPreview(origtex->nodetree, sp->sizex, sp->sizey); - ntreeInitPreview(tex->nodetree, sp->sizex, sp->sizey); + BKE_node_preview_init_tree(origtex->nodetree, sp->sizex, sp->sizey, TRUE); + BKE_node_preview_init_tree(tex->nodetree, sp->sizex, sp->sizey, TRUE); } } else if (id_type == ID_LA) { @@ -479,8 +479,8 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre if (la && la->nodetree && sp->pr_method == PR_NODE_RENDER) { /* two previews, they get copied by wmJob */ - ntreeInitPreview(origla->nodetree, sp->sizex, sp->sizey); - ntreeInitPreview(la->nodetree, sp->sizex, sp->sizey); + BKE_node_preview_init_tree(origla->nodetree, sp->sizex, sp->sizey, TRUE); + BKE_node_preview_init_tree(la->nodetree, sp->sizex, sp->sizey, TRUE); } } else if (id_type == ID_WO) { @@ -497,8 +497,8 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre if (wrld && wrld->nodetree && sp->pr_method == PR_NODE_RENDER) { /* two previews, they get copied by wmJob */ - ntreeInitPreview(wrld->nodetree, sp->sizex, sp->sizey); - ntreeInitPreview(origwrld->nodetree, sp->sizex, sp->sizey); + BKE_node_preview_init_tree(wrld->nodetree, sp->sizex, sp->sizey, TRUE); + BKE_node_preview_init_tree(origwrld->nodetree, sp->sizex, sp->sizey, TRUE); } } diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index c33b7442e41..54f59a82adc 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -379,7 +379,7 @@ static int new_material_exec(bContext *C, wmOperator *UNUSED(op)) ma = BKE_material_add(bmain, "Material"); if (BKE_scene_use_new_shading_nodes(scene)) { - ED_node_shader_default(scene, &ma->id); + ED_node_shader_default(C, &ma->id); ma->use_nodes = TRUE; } } @@ -481,7 +481,7 @@ static int new_world_exec(bContext *C, wmOperator *UNUSED(op)) wo = add_world(bmain, "World"); if (BKE_scene_use_new_shading_nodes(scene)) { - ED_node_shader_default(scene, &wo->id); + ED_node_shader_default(C, &wo->id); wo->use_nodes = TRUE; } } diff --git a/source/blender/editors/render/render_update.c b/source/blender/editors/render/render_update.c index a467b053443..d29c711cad0 100644 --- a/source/blender/editors/render/render_update.c +++ b/source/blender/editors/render/render_update.c @@ -377,7 +377,7 @@ static void texture_changed(Main *bmain, Tex *tex) if (scene->use_nodes && scene->nodetree) { for (node = scene->nodetree->nodes.first; node; node = node->next) { if (node->id == &tex->id) - ED_node_changed_update(&scene->id, node); + ED_node_tag_update_id(&scene->id); } } |