[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20186] trunk/blender/source/blender/ python/api2_2x/Modifier.c: Python API

[Ken Hughes]

Revision: 20186
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20186
Author:   khughes
Date:     2009-05-13 17:41:33 +0200 (Wed, 13 May 2009)

Log Message:
-----------
Python API
----------
Fix problem with ShrinkWrap PROJECT_OVER_NORMAL setting.

Modified Paths:
--------------
    trunk/blender/source/blender/python/api2_2x/Modifier.c

Modified: trunk/blender/source/blender/python/api2_2x/Modifier.c
===================================================================
--- trunk/blender/source/blender/python/api2_2x/Modifier.c	2009-05-13 12:26:54 UTC (rev 20185)
+++ trunk/blender/source/blender/python/api2_2x/Modifier.c	2009-05-13 15:41:33 UTC (rev 20186)
@@ -1046,7 +1046,7 @@
 				( md->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS) ) ;	
 	case EXPP_MOD_PROJECT_OVER_NORMAL:
 		return PyBool_FromLong( ( long ) 
-				( md->projAxis & MOD_SHRINKWRAP_PROJECT_OVER_NORMAL) ) ;
+				( md->projAxis == MOD_SHRINKWRAP_PROJECT_OVER_NORMAL) ) ;
 	case EXPP_MOD_SUBSURFLEVELS:
 		return PyInt_FromLong( ( long )md->subsurfLevels );	
 	default:
@@ -1107,10 +1107,10 @@
 	case EXPP_MOD_PROJECT_OVER_Z_AXIS:
 		return EXPP_setBitfield( value, &md->projAxis,
 					MOD_SHRINKWRAP_PROJECT_OVER_Z_AXIS, 'h' );
-	case EXPP_MOD_PROJECT_OVER_NORMAL:
-		return EXPP_setBitfield( value, &md->projAxis,
-					MOD_SHRINKWRAP_PROJECT_OVER_NORMAL, 'h' );
-
+	case EXPP_MOD_PROJECT_OVER_NORMAL:{
+					md->projAxis = MOD_SHRINKWRAP_PROJECT_OVER_NORMAL; 
+		return 0;
+	} 					
 	case EXPP_MOD_ALLOW_POS_DIR:
 				return EXPP_setBitfield( value, &md->shrinkOpts,
 					MOD_SHRINKWRAP_PROJECT_ALLOW_POS_DIR, 'h' );
@@ -1974,8 +1974,7 @@
 			PyConstant_Insert( d, "LOCK_AXIS_X", 
 				PyInt_FromLong( EXPP_MOD_LOCK_AXIS_X ) );
 			PyConstant_Insert( d, "LOCK_AXIS_Y", 
-				PyInt_FromLong( EXPP_MOD_LOCK_AXIS_Y ) );
-			
+				PyInt_FromLong( EXPP_MOD_LOCK_AXIS_Y ) );		
 			PyConstant_Insert( d, "OBJECT_AUX", 
 				PyInt_FromLong( EXPP_MOD_OBJECT_AUX ) );
 			PyConstant_Insert( d, "KEEPDIST", 
@@ -1985,7 +1984,9 @@
 			PyConstant_Insert( d, "PROJECT_OVER_Y_AXIS", 
 				PyInt_FromLong( EXPP_MOD_PROJECT_OVER_Y_AXIS ) );					
 			PyConstant_Insert( d, "PROJECT_OVER_Z_AXIS", 
-				PyInt_FromLong( EXPP_MOD_PROJECT_OVER_Z_AXIS ) );					
+				PyInt_FromLong( EXPP_MOD_PROJECT_OVER_Z_AXIS ) );
+			PyConstant_Insert( d, "PROJECT_OVER_NORMAL", 
+				PyInt_FromLong( EXPP_MOD_PROJECT_OVER_NORMAL ) );
 			PyConstant_Insert( d, "SUBSURFLEVELS", 
 				PyInt_FromLong( EXPP_MOD_SUBSURFLEVELS ) );					
 			PyConstant_Insert( d, "ALLOW_POS_DIR",