blender
/
blender
130
398
Fork 573
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Cleanup: remove inline list-count

This commit is contained in:
Campbell Barton 2014-11-11 19:32:46 +01:00
parent 4a37269d0a
commit 893aac18c6
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_scene.h
View File

@ -110,7 +110,7 @@ char *BKE_scene_find_marker_name(struct Scene *scene, int frame);
char *BKE_scene_find_last_marker_name(struct Scene *scene, int frame);
/* checks for cycle, returns 1 if it's all OK */
int BKE_scene_validate_setscene(struct Main *bmain, struct Scene *sce);
bool BKE_scene_validate_setscene(struct Main *bmain, struct Scene *sce);
float BKE_scene_frame_get(struct Scene *scene);
float BKE_scene_frame_get_from_ctime(struct Scene *scene, const float frame);

13
source/blender/blenkernel/intern/scene.c
View File

@ -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 */