diff options
author | Bastien Montagne <bastien@blender.org> | 2020-06-10 19:30:59 +0300 |
---|---|---|
committer | Bastien Montagne <bastien@blender.org> | 2020-06-10 20:45:52 +0300 |
commit | 4f314ee5b95a1d01cedca2272056f866d1557d7b (patch) | |
tree | 1f1906aff00b02a6af5ba94faa8b73c7dc80bdfd | |
parent | eee35ebdfbed405c45d51dc9d5f29dfd87cea0fc (diff) |
Cleanup: rename `BKE_scene_copy` to `_update`.
Matches other similar cases for collection and object, and general
naming rule (copy is for generic ID copying, duplicate is for more
involved and poweful behaviors specific to an ID type).
-rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 | ||||
-rw-r--r-- | source/blender/editors/scene/scene_edit.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 9b048b1552a..800370318c4 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -108,7 +108,7 @@ struct Scene *BKE_scene_set_name(struct Main *bmain, const char *name); struct ToolSettings *BKE_toolsettings_copy(struct ToolSettings *toolsettings, const int flag); void BKE_toolsettings_free(struct ToolSettings *toolsettings); -struct Scene *BKE_scene_copy(struct Main *bmain, struct Scene *sce, eSceneCopyMethod type); +struct Scene *BKE_scene_duplicate(struct Main *bmain, struct Scene *sce, eSceneCopyMethod type); void BKE_scene_groups_relink(struct Scene *sce); struct Scene *BKE_scene_find_from_collection(const struct Main *bmain, diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 1b06217f1df..b6b478f727e 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -749,7 +749,7 @@ void BKE_scene_copy_data_eevee(Scene *sce_dst, const Scene *sce_src) /* TODO Copy the cache. */ } -Scene *BKE_scene_copy(Main *bmain, Scene *sce, eSceneCopyMethod type) +Scene *BKE_scene_duplicate(Main *bmain, Scene *sce, eSceneCopyMethod type) { Scene *sce_copy; diff --git a/source/blender/editors/scene/scene_edit.c b/source/blender/editors/scene/scene_edit.c index 059337dd6fe..c32bb69db4e 100644 --- a/source/blender/editors/scene/scene_edit.c +++ b/source/blender/editors/scene/scene_edit.c @@ -67,7 +67,7 @@ Scene *ED_scene_add(Main *bmain, bContext *C, wmWindow *win, eSceneCopyMethod me ED_editors_flush_edits(bmain); } - scene_new = BKE_scene_copy(bmain, scene_old, method); + scene_new = BKE_scene_duplicate(bmain, scene_old, method); } WM_window_set_active_scene(bmain, C, win, scene_new); |