[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14519] trunk/blender/source/blender: WITH_BULLET wasn't working for Makefiles.

[Kent Mein]

Revision: 14519
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14519
Author:   sirdude
Date:     2008-04-22 21:14:33 +0200 (Tue, 22 Apr 2008)

Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/collision.c
    trunk/blender/source/blender/src/buttons_object.c

Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c	2008-04-22 15:37:54 UTC (rev 14518)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c	2008-04-22 19:14:33 UTC (rev 14519)
@@ -639,7 +639,7 @@
 		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

Modified: trunk/blender/source/blender/src/buttons_object.c
===================================================================
--- trunk/blender/source/blender/src/buttons_object.c	2008-04-22 15:37:54 UTC (rev 14518)
+++ trunk/blender/source/blender/src/buttons_object.c	2008-04-22 19:14:33 UTC (rev 14519)
@@ -5657,7 +5657,7 @@
 		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)
 		{