From 902b239aa8de92d559c7b431eaa4321d9dc2b7cf Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 17 Dec 2010 15:37:59 +0000 Subject: no functional changes: SETLOOPER macro assumed a scene was defined called 'sce' used to loop over, now make this an argument, helps to make it clear what's going on. --- source/blender/blenkernel/intern/collision.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source/blender/blenkernel/intern/collision.c') diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index d39e550192b..b2d587151b1 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -1358,9 +1358,9 @@ Object **get_collisionobjects(Scene *scene, Object *self, Group *group, unsigned add_collision_object(&objs, &numobj, &maxobj, go->ob, self, 0); } else { - Scene *sce; /* for SETLOOPER macro */ + Scene *sce_iter; /* add objects in same layer in scene */ - for(SETLOOPER(scene, base)) { + for(SETLOOPER(scene, sce_iter, base)) { if(base->lay & self->lay) add_collision_object(&objs, &numobj, &maxobj, base->object, self, 0); @@ -1417,11 +1417,11 @@ ListBase *get_collider_cache(Scene *scene, Object *self, Group *group) add_collider_cache_object(&objs, go->ob, self, 0); } else { - Scene *sce; /* for SETLOOPER macro */ + Scene *sce_iter; Base *base; /* add objects in same layer in scene */ - for(SETLOOPER(scene, base)) { + for(SETLOOPER(scene, sce_iter, base)) { if(!self || (base->lay & self->lay)) add_collider_cache_object(&objs, base->object, self, 0); -- cgit v1.2.3