diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-07-23 14:30:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-23 14:30:55 +0400 |
| commit | 82f16f81fd0e70872b759caa501a116f815bb3f6 (patch) | |
| tree | 92c6cb9588dc004d3a94f7ecd8312207c1e085c1 /source/blender/blenkernel/intern/scene.c | |
| parent | f88593df6911f99d576a5b223eb84749e4fce965 (diff) | |
Cleanup: BKE_scene_set_name mixed G.main & bmain arg
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 66b2e3c6e97..717477c5e48 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -719,14 +719,14 @@ void BKE_scene_set_background(Main *bmain, Scene *scene) /* called from creator.c */ Scene *BKE_scene_set_name(Main *bmain, const char *name) { - Scene *sce = (Scene *)BKE_libblock_find_name(ID_SCE, name); + Scene *sce = (Scene *)BKE_libblock_find_name_ex(bmain, ID_SCE, name); if (sce) { BKE_scene_set_background(bmain, sce); - printf("Scene switch: '%s' in file: '%s'\n", name, G.main->name); + printf("Scene switch: '%s' in file: '%s'\n", name, bmain->name); return sce; } - printf("Can't find scene: '%s' in file: '%s'\n", name, G.main->name); + printf("Can't find scene: '%s' in file: '%s'\n", name, bmain->name); return NULL; } |