[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25369] trunk/blender: edits to the bone copy metarig type from Cessen, pointcache warning fix

[Campbell Barton]

Revision: 25369
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25369
Author:   campbellbarton
Date:     2009-12-14 15:42:46 +0100 (Mon, 14 Dec 2009)

Log Message:
-----------
edits to the bone copy metarig type from Cessen, pointcache warning fix

Modified Paths:
--------------
    trunk/blender/release/scripts/modules/rigify/copy.py
    trunk/blender/source/blender/editors/physics/physics_pointcache.c
    trunk/blender/source/blender/makesrna/intern/rna_ID.c

Modified: trunk/blender/release/scripts/modules/rigify/copy.py
===================================================================
--- trunk/blender/release/scripts/modules/rigify/copy.py	2009-12-14 14:34:57 UTC (rev 25368)
+++ trunk/blender/release/scripts/modules/rigify/copy.py	2009-12-14 14:42:46 UTC (rev 25369)
@@ -50,7 +50,10 @@
     mt = bone_class_instance(obj, METARIG_NAMES)
     mt.cpy = bone_definition[0]
     mt.update()
-    cp = mt.copy(to_fmt="%s_cpy")
+    cp = bone_class_instance(obj, ["cpy"])
+    cp.cpy_e = copy_bone_simple(arm, mt.cpy, base_names[mt.cpy], parent=True)
+    cp.cpy = cp.cpy_e.name
+    
     bpy.ops.object.mode_set(mode='OBJECT')
 
     cp.update()
@@ -63,8 +66,20 @@
 
     con = cp.cpy_p.constraints.new('COPY_ROTATION')
     con.target = obj
-    con.subtarget = mt.cpy
+    con.subtarget = cp.cpy
 
+    con = mt.cpy_p.constraints.new('COPY_SCALE')
+    con.target = obj
+    con.subtarget = cp.cpy
+    
+    # Rotation mode and axis locks
+    cp.cpy_p.rotation_mode = mt.cpy_p.rotation_mode
+    cp.cpy_p.lock_location = tuple(mt.cpy_p.lock_location)
+    cp.cpy_p.lock_rotations_4d = mt.cpy_p.lock_rotations_4d
+    cp.cpy_p.lock_rotation = tuple(mt.cpy_p.lock_rotation)
+    cp.cpy_p.lock_rotation_w = mt.cpy_p.lock_rotation_w
+    cp.cpy_p.lock_scale = tuple(mt.cpy_p.lock_scale)
+
     # setup layers last
     layers = get_layer_dict(options)
     cp.cpy_b.layer = layers["main"]

Modified: trunk/blender/source/blender/editors/physics/physics_pointcache.c
===================================================================
--- trunk/blender/source/blender/editors/physics/physics_pointcache.c	2009-12-14 14:34:57 UTC (rev 25368)
+++ trunk/blender/source/blender/editors/physics/physics_pointcache.c	2009-12-14 14:42:46 UTC (rev 25369)
@@ -86,7 +86,7 @@
 	fflush(stdout);
 }
 
-void bake_console_progress_end(void *arg, int nr)
+void bake_console_progress_end(void *arg)
 {
 	printf("\n");
 }

Modified: trunk/blender/source/blender/makesrna/intern/rna_ID.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ID.c	2009-12-14 14:34:57 UTC (rev 25368)
+++ trunk/blender/source/blender/makesrna/intern/rna_ID.c	2009-12-14 14:42:46 UTC (rev 25369)
@@ -246,7 +246,7 @@
 	if(idprop && idprop->type == IDP_STRING)
 		strcpy(str, idprop->data.pointer);
 	else
-		strcpy(str, "");
+		str[0]= '\0';
 }
 
 void rna_IDPropertyGroup_name_set(PointerRNA *ptr, const char *value)