diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-01-11 01:55:41 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-11 02:01:01 +0300 |
commit | f33000526679c543c1398a68a84b93dad521a5cb (patch) | |
tree | 91ffe827dd47859eca1c6c84516ff9f9be68a273 /source/blender/editors/render | |
parent | 76bdd40bfdc7a212c70c2032edaa6faef1423c9f (diff) |
Cleanup: BKE naming conventions for datablock add/localize
Conventions were already followed nearly everywhere.
Diffstat (limited to 'source/blender/editors/render')
-rw-r--r-- | source/blender/editors/render/render_preview.c | 6 | ||||
-rw-r--r-- | source/blender/editors/render/render_shading.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c index 35d772afae7..c2532ba033e 100644 --- a/source/blender/editors/render/render_preview.c +++ b/source/blender/editors/render/render_preview.c @@ -331,7 +331,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty if (origmat) { /* work on a copy */ - mat = localize_material(origmat); + mat = BKE_material_localize(origmat); sp->matcopy = mat; BLI_addtail(&pr_main->mat, mat); @@ -476,7 +476,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty /* work on a copy */ if (origla) { - la = localize_lamp(origla); + la = BKE_lamp_localize(origla); sp->lampcopy = la; BLI_addtail(&pr_main->lamp, la); } @@ -512,7 +512,7 @@ static Scene *preview_prepare_scene(Main *bmain, Scene *scene, ID *id, int id_ty World *wrld = NULL, *origwrld = (World *)id; if (origwrld) { - wrld = localize_world(origwrld); + wrld = BKE_world_localize(origwrld); sp->worldcopy = wrld; BLI_addtail(&pr_main->world, wrld); } diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 0a7bca1f490..2a617f91e6c 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -580,7 +580,7 @@ static int new_world_exec(bContext *C, wmOperator *UNUSED(op)) wo = BKE_world_copy(bmain, wo); } else { - wo = add_world(bmain, DATA_("World")); + wo = BKE_world_add(bmain, DATA_("World")); if (BKE_scene_use_new_shading_nodes(scene)) { ED_node_shader_default(C, &wo->id); |