diff options
| author | Kent Mein <mein@cs.umn.edu> | 2008-04-22 23:14:33 +0400 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2008-04-22 23:14:33 +0400 |
| commit | ff26d59577bad5051ea872100b7d725d1af817a0 (patch) | |
| tree | ada50adc04a47f3ee6b814b6191b0b01c5750fec /source | |
| parent | fa27b5bcc72e83bc804081031318264742c68880 (diff) | |
WITH_BULLET wasn't working for Makefiles.
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
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/blenkernel/intern/collision.c | 2 | ||||
| -rw-r--r-- | source/blender/src/buttons_object.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 22f68eecd3f..e244ccca306 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -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 diff --git a/source/blender/src/buttons_object.c b/source/blender/src/buttons_object.c index 9aee62be7c0..d85e854c90c 100644 --- a/source/blender/src/buttons_object.c +++ b/source/blender/src/buttons_object.c @@ -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) { |