Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-12-13 05:17:22 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-12-13 05:17:22 +0400
commit0082b25eec4717794a2adeca0c684599d0cc6b3c (patch)
tree54ce4117df8c4c90748cece7043fe6ecb61db749 /source/blender/blenkernel/intern/scene.c
parent96b2dc8e13ad6364c23119dcb909da785b5dca2b (diff)
remove BKE_main_scene_add(), just add main arg to BKE_scene_add()
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r--source/blender/blenkernel/intern/scene.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 47f0da18163..6a5886faa67 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -143,7 +143,8 @@ Scene *BKE_scene_copy(Scene *sce, int type)
if (type == SCE_COPY_EMPTY) {
ListBase lb;
- scen = BKE_scene_add(sce->id.name + 2);
+ /* XXX. main should become an arg */
+ scen = BKE_scene_add(G.main, sce->id.name + 2);
lb = scen->r.layers;
scen->r = sce->r;
@@ -604,12 +605,7 @@ static Scene *scene_add(Main *bmain, const char *name)
return sce;
}
-Scene *BKE_scene_add(const char *name)
-{
- return scene_add(G.main, name);
-}
-
-Scene *BKE_main_scene_add(Main *bmain, const char *name)
+Scene *BKE_scene_add(Main *bmain, const char *name)
{
return scene_add(bmain, name);
}