[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45873] trunk/blender/source: code cleanup : remove unused defines
Campbell Barton
ideasman42 at gmail.com
Mon Apr 23 10:05:04 CEST 2012
Revision: 45873
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45873
Author: campbellbarton
Date: 2012-04-23 08:05:02 +0000 (Mon, 23 Apr 2012)
Log Message:
-----------
code cleanup: remove unused defines
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_armature.h
trunk/blender/source/blender/imbuf/intern/util.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
trunk/blender/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
Modified: trunk/blender/source/blender/blenkernel/BKE_armature.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_armature.h 2012-04-23 07:32:13 UTC (rev 45872)
+++ trunk/blender/source/blender/blenkernel/BKE_armature.h 2012-04-23 08:05:02 UTC (rev 45873)
@@ -136,7 +136,6 @@
/* like EBONE_VISIBLE */
#define PBONE_VISIBLE(arm, bone) (((bone)->layer & (arm)->layer) && !((bone)->flag & BONE_HIDDEN_P))
-#define _BONE_VISIBLE(arm, bone) (((bone)->layer & (arm)->layer) && !((bone)->flag & BONE_HIDDEN_P))
#ifdef __cplusplus
}
Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c 2012-04-23 07:32:13 UTC (rev 45872)
+++ trunk/blender/source/blender/imbuf/intern/util.c 2012-04-23 08:05:02 UTC (rev 45873)
@@ -362,8 +362,11 @@
if (isredcode(name)) return (ANIM_REDCODE);
#endif
type = IMB_ispic(name);
- if (type) return(ANIM_SEQUENCE);
- return(0);
+ if (type) {
+ return ANIM_SEQUENCE;
+ }
+
+ return ANIM_NONE;
}
int IMB_isanim(const char *filename)
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-04-23 07:32:13 UTC (rev 45872)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2012-04-23 08:05:02 UTC (rev 45873)
@@ -640,10 +640,6 @@
/* physicsEngine */
#define WOPHY_NONE 0
-#define WOPHY_ENJI 1
-#define WOPHY_SUMO 2
-#define WOPHY_DYNAMO 3
-#define WOPHY_ODE 4
#define WOPHY_BULLET 5
/* obstacleSimulation */
Modified: trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp 2012-04-23 07:32:13 UTC (rev 45872)
+++ trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp 2012-04-23 08:05:02 UTC (rev 45873)
@@ -1839,10 +1839,6 @@
break;
#endif
- case UseDynamo:
- //KX_ConvertDynamoObject(gameobj,meshobj,kxscene,shapeprops, smmaterial, &objprop);
- break;
-
case UseNone:
default:
break;
Modified: trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp 2012-04-23 07:32:13 UTC (rev 45872)
+++ trunk/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp 2012-04-23 08:05:02 UTC (rev 45873)
@@ -308,25 +308,11 @@
useDbvtCulling = (blenderscene->gm.mode & WO_DBVT_CULLING) != 0;
break;
}
-
- case WOPHY_ODE:
- {
- physics_engine = UseODE;
- break;
- }
- case WOPHY_DYNAMO:
- {
- physics_engine = UseDynamo;
- break;
- }
- case WOPHY_SUMO:
- {
- physics_engine = UseSumo;
- break;
- }
+ default:
case WOPHY_NONE:
{
physics_engine = UseNone;
+ break;
}
}
}
@@ -352,11 +338,7 @@
destinationscene->SetPhysicsEnvironment(ccdPhysEnv);
break;
}
-#endif
- case UseDynamo:
- {
- }
-
+#endif
default:
case UseNone:
physics_engine = UseNone;
Modified: trunk/blender/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h 2012-04-23 07:32:13 UTC (rev 45872)
+++ trunk/blender/source/gameengine/Ketsji/KX_PhysicsEngineEnums.h 2012-04-23 08:05:02 UTC (rev 45873)
@@ -36,11 +36,7 @@
{
NoSelection = -1,
UseNone = 0,
- UseEnji = 1,
- UseSumo = 2,
- UseDynamo = 3,
- UseODE = 4,
- UseBullet = 5,
+ UseBullet = 5,
};
#endif //__KX_PHYSICSENGINEENUMS_H__
More information about the Bf-blender-cvs
mailing list