From f7cb86df3a9ceccc4d649e42735732a608169157 Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Sun, 4 Jan 2009 14:14:06 +0000 Subject: 2.5 Think global, act local! The old favorite G.scene gone! Man... that took almost 2 days. Also removed G.curscreen and G.edbo. Not everything could get solved; here's some notes. - modifiers now store current scene in ModifierData. This is not meant for permanent, but it can probably stick there until we cleaned the anim system and depsgraph to cope better with timing issues. - Game engine G.scene should become an argument for staring it. Didn't solve this yet. - Texture nodes should get scene cfra, but the current implementation is too tightly wrapped to do it easily. --- source/blender/blenkernel/BKE_collision.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source/blender/blenkernel/BKE_collision.h') diff --git a/source/blender/blenkernel/BKE_collision.h b/source/blender/blenkernel/BKE_collision.h index c483148e4de..2518c1d6939 100644 --- a/source/blender/blenkernel/BKE_collision.h +++ b/source/blender/blenkernel/BKE_collision.h @@ -50,6 +50,7 @@ #include "BLI_kdopbvh.h" struct Object; +struct Scene; struct Cloth; struct MFace; struct DerivedMesh; @@ -138,7 +139,7 @@ void interpolateOnTriangle ( float to[3], float v1[3], float v2[3], float v3[3], ///////////////////////////////////////////////// // used in effect.c ///////////////////////////////////////////////// -CollisionModifierData **get_collisionobjects(Object *self, int *numcollobj); +CollisionModifierData **get_collisionobjects(struct Scene *scene, Object *self, int *numcollobj); ///////////////////////////////////////////////// -- cgit v1.2.3