Revision: 42866
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42866
Author: mont29
Date: 2011-12-24 14:37:14 +0000 (Sat, 24 Dec 2011)
Log Message:
-----------
Ooops! Forgot to add "md control" on weight preview in WeightVG Edit and Mix
modifiers...
Modified Paths:
--------------
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgmix.c
Modified:
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgedit.c
===================================================================
---
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgedit.c
2011-12-24 14:35:14 UTC (rev 42865)
+++
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgedit.c
2011-12-24 14:37:14 UTC (rev 42866)
@@ -191,7 +191,7 @@
int do_add = (wmd->edit_flags & MOD_WVG_EDIT_ADD2VG) != 0;
int do_rem = (wmd->edit_flags & MOD_WVG_EDIT_REMFVG) != 0;
/* Only do weight-preview in Object, Sculpt and Pose modes! */
- int do_prev = (wmd->common_flags & MOD_WVG_CFLAG_WEIGHT_PREVIEW);
+ int do_prev = ((wmd->common_flags & MOD_WVG_CFLAG_WEIGHT_PREVIEW) &&
DM_get_flag(dm, DM_MOD_DO_WMCOL));
/* Get number of verts. */
numVerts = dm->getNumVerts(dm);
Modified:
branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgmix.c
===================================================================
--- branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgmix.c
2011-12-24 14:35:14 UTC (rev 42865)
+++ branches/vgroup_modifiers/source/blender/modifiers/intern/MOD_weightvgmix.c
2011-12-24 14:37:14 UTC (rev 42866)
@@ -233,7 +233,7 @@
int i;
/* Flags. */
/* Only do weight-preview in Object, Sculpt and Pose modes! */
- int do_prev = (wmd->common_flags & MOD_WVG_CFLAG_WEIGHT_PREVIEW);
+ int do_prev = ((wmd->common_flags & MOD_WVG_CFLAG_WEIGHT_PREVIEW) &&
DM_get_flag(dm, DM_MOD_DO_WMCOL));
/* Get number of verts. */
numVerts = dm->getNumVerts(dm);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
