diff options
author | Campbell Barton <ideasman42@gmail.com> | 2014-11-11 21:32:46 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-11-11 21:32:46 +0300 |
commit | 893aac18c65ba057170bddf693b3546338331a58 (patch) | |
tree | d7b0334a21c0255b15786ade7ce9ce24c834dc48 /source/blender/blenkernel/intern/scene.c | |
parent | 4a37269d0a13df639e7561851ea8cd11fb047769 (diff) |
Cleanup: remove inline list-count
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
-rw-r--r-- | source/blender/blenkernel/intern/scene.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index d9575079f73..45d883140f5 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -1096,18 +1096,15 @@ void BKE_scene_base_select(Scene *sce, Base *selbase) } /* checks for cycle, returns 1 if it's all OK */ -int BKE_scene_validate_setscene(Main *bmain, Scene *sce) +bool BKE_scene_validate_setscene(Main *bmain, Scene *sce) { - Scene *scene; + Scene *sce_iter; int a, totscene; - + if (sce->set == NULL) return 1; + totscene = BLI_countlist(&bmain->scene); - totscene = 0; - for (scene = bmain->scene.first; scene; scene = scene->id.next) - totscene++; - - for (a = 0, scene = sce; scene->set; scene = scene->set, a++) { + for (a = 0, sce_iter = sce; sce_iter->set; sce_iter = sce_iter->set, a++) { /* more iterations than scenes means we have a cycle */ if (a > totscene) { /* the tested scene gets zero'ed, that's typically current scene */ |