[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [11314] trunk/blender/source: removing duplicate constants

[Campbell Barton]

Revision: 11314
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=11314
Author:   campbellbarton
Date:     2007-07-19 14:29:28 +0200 (Thu, 19 Jul 2007)

Log Message:
-----------
removing duplicate constants

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_action.h
    trunk/blender/source/blender/blenkernel/intern/action.c
    trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp

Modified: trunk/blender/source/blender/blenkernel/BKE_action.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_action.h	2007-07-19 11:46:37 UTC (rev 11313)
+++ trunk/blender/source/blender/blenkernel/BKE_action.h	2007-07-19 12:29:28 UTC (rev 11314)
@@ -153,11 +153,5 @@
 };
 #endif
 
-/* nla strip->mode, for action blending */
-enum	{
-			POSE_BLEND		= 0,
-			POSE_ADD
-};
-
 #endif
 

Modified: trunk/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/action.c	2007-07-19 11:46:37 UTC (rev 11313)
+++ trunk/blender/source/blender/blenkernel/intern/action.c	2007-07-19 12:29:28 UTC (rev 11314)
@@ -458,10 +458,10 @@
 	float dstweight;
 	
 	switch (mode){
-		case POSE_BLEND:
+		case ACTSTRIPMODE_BLEND:
 			dstweight = 1.0F - srcweight;
 			break;
-		case POSE_ADD:
+		case ACTSTRIPMODE_ADD:
 			dstweight = 1.0F;
 			break;
 		default :
@@ -563,10 +563,10 @@
 	int i;
 	
 	switch (mode){
-	case POSE_BLEND:
+	case ACTSTRIPMODE_BLEND:
 		dstweight = 1.0F - srcweight;
 		break;
-	case POSE_ADD:
+	case ACTSTRIPMODE_ADD:
 		dstweight = 1.0F;
 		break;
 	default :
@@ -582,7 +582,7 @@
 			if (schan->flag & POSE_ROT) {
 				QUATCOPY(dquat, dchan->quat);
 				QUATCOPY(squat, schan->quat);
-				if(mode==POSE_BLEND)
+				if(mode==ACTSTRIPMODE_BLEND)
 					QuatInterpol(dchan->quat, dquat, squat, srcweight);
 				else
 					QuatAdd(dchan->quat, dquat, squat, srcweight);
@@ -825,10 +825,10 @@
 	float dstweight;
 	
 	switch (mode){
-		case POSE_BLEND:
+		case ACTSTRIPMODE_BLEND:
 			dstweight = 1.0F - srcweight;
 			break;
-		case POSE_ADD:
+		case ACTSTRIPMODE_ADD:
 			dstweight = 1.0F;
 			break;
 		default :

Modified: trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp	2007-07-19 11:46:37 UTC (rev 11313)
+++ trunk/blender/source/gameengine/Converter/BL_ActionActuator.cpp	2007-07-19 12:29:28 UTC (rev 11314)
@@ -384,7 +384,7 @@
 				
 				/* Find percentages */
 				newweight = (m_blendframe/(float)m_blendin);
-				blend_poses(m_pose, m_blendpose, 1.0 - newweight, POSE_BLEND);
+				blend_poses(m_pose, m_blendpose, 1.0 - newweight, ACTSTRIPMODE_BLEND);
 
 				/* Increment current blending percentage */
 				m_blendframe = (curtime - m_blendstart)*KX_FIXED_FRAME_PER_SEC;