sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

WITH_BULLET wasn't working for Makefiles.

Browse Source 
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
This commit is contained in:
Kent Mein 2008-04-22 19:14:33 +00:00
parent fa27b5bcc7
commit ff26d59577
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/collision.c
View 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

2
source/blender/src/buttons_object.c
View 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)
{