WITH_BULLET wasn't working for Makefiles.
authorKent Mein <mein@cs.umn.edu>
Tue, 22 Apr 2008 19:14:33 +0000 (19:14 +0000)
committerKent Mein <mein@cs.umn.edu>
Tue, 22 Apr 2008 19:14:33 +0000 (19:14 +0000)
I changed it so its tests are more inline with other defines.
Jesterking said this shouldn't affect scons so yell at him if it does. ;)

Kent

source/blender/blenkernel/intern/collision.c
source/blender/src/buttons_object.c

index 22f68eecd3f28ed35f51cd6855f15c7155e4529b..e244ccca306304b80feb18842c8a7bd5603e41c2 100644 (file)
@@ -639,7 +639,7 @@ void cloth_collision_static ( ModifierData *md1, ModifierData *md2, CollisionTre
                if ( i < 4 )
                {
                        // calc distance + normal
-#if WITH_BULLET == 1
+#ifdef WITH_BULLET
                        distance = plNearestPoints (
                                       verts1[collpair->ap1].txold, verts1[collpair->ap2].txold, verts1[collpair->ap3].txold, collmd->current_x[collpair->bp1].co, collmd->current_x[collpair->bp2].co, collmd->current_x[collpair->bp3].co, collpair->pa,collpair->pb,collpair->vector );
 #else
index 9aee62be7c0e10c454c03cd9686967233448e606..d85e854c90c257d28896bf610af313fbd2077d67 100644 (file)
@@ -5657,7 +5657,7 @@ static void object_panel_cloth_II(Object *ob)
                else
                uiDefBut(block, LABEL, 0, " ",  10,80,145,20, NULL, 0.0, 0, 0, 0, "");
                */
-#if WITH_BULLET == 1
+#ifdef WITH_BULLET
                uiDefButBitI(block, TOG, CLOTH_COLLSETTINGS_FLAG_ENABLED, B_BAKE_CACHE_CHANGE, "Enable collisions",     10,60,150,20, &clmd->coll_parms->flags, 0, 0, 0, 0, "Enable collisions with this object");
                if (clmd->coll_parms->flags & CLOTH_COLLSETTINGS_FLAG_ENABLED)
                {