diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 02:37:04 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 02:37:04 +0400 |
| commit | ae25aa22105b060294095357692f2aed4c650ce8 (patch) | |
| tree | 06548276f86326f21943f8ec7ef92765a97b5ab5 /source/blender/editors/render/render_shading.c | |
| parent | 29b7b344fc48ed31b1e36818ab4767090691d6e2 (diff) | |
| parent | 03762409cd4f812d152e42de9c4f9853df91be0b (diff) | |
svn merge ^/trunk/blender -r55372:55392
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index decc5b131ae..68766591788 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -385,7 +385,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; } } @@ -487,7 +487,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; } } |