diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-07-13 20:06:51 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-07-13 20:06:51 +0400 |
commit | 8ee36e1da56b10a84e02ba9790fbcafbdbf43f51 (patch) | |
tree | 004230f80e18ad61506952b8a5dea6189c8a2571 /source/blender/blenkernel/BKE_scene.h | |
parent | ea143875f7b26654d0d2bb07d6510c0060877375 (diff) |
- fix for eternal loop with metaballs in set scenes.
- next_object() now loops through all set scenes, not just the first one.
- removed F_SET, rather them having a mode for looping on a set, just use the set when the first scene ends.
- metaballs can now glob between scenes however there are still some depsgraph issues that existed before.
Diffstat (limited to 'source/blender/blenkernel/BKE_scene.h')
-rw-r--r-- | source/blender/blenkernel/BKE_scene.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index b5b0a72d2d8..f0fb2a65673 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -63,7 +63,7 @@ struct Scene *set_scene_name(char *name); struct Scene *copy_scene(struct Main *bmain, struct Scene *sce, int type); void unlink_scene(struct Main *bmain, struct Scene *sce, struct Scene *newsce); -int next_object(struct Scene *scene, int val, struct Base **base, struct Object **ob); +int next_object(struct Scene **scene, int val, struct Base **base, struct Object **ob); struct Object *scene_find_camera(struct Scene *sc); struct Object *scene_camera_switch_find(struct Scene *scene); // DURIAN_CAMERA_SWITCH int scene_camera_switch_update(struct Scene *scene); |