[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33115] trunk/blender/source/blender: the 'Multi' option was not being copied with the armature modifier.
Campbell Barton
ideasman42 at gmail.com
Wed Nov 17 02:50:25 CET 2010
Revision: 33115
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33115
Author: campbellbarton
Date: 2010-11-17 02:50:25 +0100 (Wed, 17 Nov 2010)
Log Message:
-----------
the 'Multi' option was not being copied with the armature modifier.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/armature.c
trunk/blender/source/blender/modifiers/intern/MOD_armature.c
Modified: trunk/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/armature.c 2010-11-17 01:15:31 UTC (rev 33114)
+++ trunk/blender/source/blender/blenkernel/intern/armature.c 2010-11-17 01:50:25 UTC (rev 33115)
@@ -813,9 +813,9 @@
bDeformGroup *dg;
DualQuat *dualquats= NULL;
float obinv[4][4], premat[4][4], postmat[4][4];
- int use_envelope = deformflag & ARM_DEF_ENVELOPE;
- int use_quaternion = deformflag & ARM_DEF_QUATERNION;
- int invert_vgroup= deformflag & ARM_DEF_INVERT_VGROUP;
+ const short use_envelope = deformflag & ARM_DEF_ENVELOPE;
+ const short use_quaternion = deformflag & ARM_DEF_QUATERNION;
+ const short invert_vgroup= deformflag & ARM_DEF_INVERT_VGROUP;
int numGroups = 0; /* safety for vertexgroup index overflow */
int i, target_totvert = 0; /* safety for vertexgroup overflow */
int use_dverts = 0;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_armature.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_armature.c 2010-11-17 01:15:31 UTC (rev 33114)
+++ trunk/blender/source/blender/modifiers/intern/MOD_armature.c 2010-11-17 01:50:25 UTC (rev 33115)
@@ -61,6 +61,7 @@
tamd->object = amd->object;
tamd->deformflag = amd->deformflag;
+ tamd->multi = amd->multi;
strncpy(tamd->defgrp_name, amd->defgrp_name, 32);
}
More information about the Bf-blender-cvs
mailing list