diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 05:17:22 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-13 05:17:22 +0400 |
| commit | 0082b25eec4717794a2adeca0c684599d0cc6b3c (patch) | |
| tree | 54ce4117df8c4c90748cece7043fe6ecb61db749 /source/blender/blenkernel | |
| parent | 96b2dc8e13ad6364c23119dcb909da785b5dca2b (diff) | |
remove BKE_main_scene_add(), just add main arg to BKE_scene_add()
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 3 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/blender.c | 4 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 10 |
3 files changed, 6 insertions, 11 deletions
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 3be07e72fc2..6447b2a8dee 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -67,8 +67,7 @@ void free_avicodecdata(struct AviCodecData *acd); void free_qtcodecdata(struct QuicktimeCodecData *acd); void BKE_scene_free(struct Scene *sce); -struct Scene *BKE_scene_add(const char *name); -struct Scene *BKE_main_scene_add(struct Main *bmain, const char *name); +struct Scene *BKE_scene_add(struct Main *bmain, const char *name); /* base functions */ struct Base *BKE_scene_base_find(struct Scene *scene, struct Object *ob); diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 6e2cfc4090e..8d923964b75 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -234,7 +234,7 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filepath curscene = bfd->curscene; if (curscene == NULL) curscene = bfd->main->scene.first; /* empty file, we add a scene to make Blender work */ - if (curscene == NULL) curscene = BKE_main_scene_add(bfd->main, "Empty"); + if (curscene == NULL) curscene = BKE_scene_add(bfd->main, "Empty"); /* and we enforce curscene to be in current screen */ if (curscreen) curscreen->scene = curscene; /* can run in bgmode */ @@ -286,7 +286,7 @@ static void setup_app_data(bContext *C, BlendFileData *bfd, const char *filepath if (CTX_data_scene(C) == NULL) { /* in case we don't even have a local scene, add one */ if (!G.main->scene.first) - BKE_scene_add("Scene"); + BKE_scene_add(G.main, "Scene"); CTX_data_scene_set(C, G.main->scene.first); CTX_wm_screen(C)->scene = CTX_data_scene(C); 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); } |