kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

edits to the bone copy metarig type from Cessen, pointcache warning fix

Browse Source
This commit is contained in:
Campbell Barton 2009-12-14 14:42:46 +00:00
parent 91215df5c2
commit d88c776614
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
release/scripts/modules/rigify/copy.py
View File

@ -50,7 +50,10 @@ def main(obj, bone_definition, base_names, options):
mt = bone_class_instance(obj, METARIG_NAMES) mt = bone_class_instance(obj, METARIG_NAMES)
mt.cpy = bone_definition[0] mt.cpy = bone_definition[0]
mt.update() 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') bpy.ops.object.mode_set(mode='OBJECT')
cp.update() cp.update()
@ -63,7 +66,19 @@ def main(obj, bone_definition, base_names, options):
con = cp.cpy_p.constraints.new('COPY_ROTATION') con = cp.cpy_p.constraints.new('COPY_ROTATION')
con.target = obj 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 # setup layers last
layers = get_layer_dict(options) layers = get_layer_dict(options)

2
source/blender/editors/physics/physics_pointcache.c
View File

@ -86,7 +86,7 @@ void bake_console_progress(void *arg, int nr)
fflush(stdout); fflush(stdout);
} }
void bake_console_progress_end(void *arg, int nr) void bake_console_progress_end(void *arg)
{ {
printf("\n"); printf("\n");
} }

2
source/blender/makesrna/intern/rna_ID.c
View File

@ -246,7 +246,7 @@ static void rna_IDPropertyGroup_name_get(PointerRNA *ptr, char *str)
if(idprop && idprop->type == IDP_STRING) if(idprop && idprop->type == IDP_STRING)
strcpy(str, idprop->data.pointer); strcpy(str, idprop->data.pointer);
else else
strcpy(str, ""); str[0]= '\0';
} }
void rna_IDPropertyGroup_name_set(PointerRNA *ptr, const char *value) void rna_IDPropertyGroup_name_set(PointerRNA *ptr, const char *value)