Revision: 53046
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53046
Author: cyborgmuppet
Date: 2012-12-16 02:29:46 +0000 (Sun, 16 Dec 2012)
Log Message:
-----------
Reverting rev 53044 because it broke something and was wrong.
I also added comment to avoid this happening in the future.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53044
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_vgroup.c
Modified: trunk/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_vgroup.c 2012-12-16
01:02:51 UTC (rev 53045)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c 2012-12-16
02:29:46 UTC (rev 53046)
@@ -447,8 +447,10 @@
}
}
-/* Could be exposed externally */
-static int ED_vgroup_transfer_weight(Object *ob_dst, Object *ob_src,
bDeformGroup *dg_src, Scene *scene,
+/* Could be exposed externally by implementing it in header with the rest.
+ * Simple refactoring will break something.
+ * For now, naming is ed_ instead of ED_*/
+static int ed_vgroup_transfer_weight(Object *ob_dst, Object *ob_src,
bDeformGroup *dg_src, Scene *scene,
WT_Method method, WT_ReplaceMode
replace_mode, wmOperator *op)
{
bDeformGroup *dg_dst;
@@ -3309,7 +3311,7 @@
switch (vertex_group_mode) {
case WT_REPLACE_ACTIVE_VERTEX_GROUP:
- if (!ED_vgroup_transfer_weight(ob_act,
ob_slc, BLI_findlink(&ob_slc->defbase, ob_slc->actdef - 1),
+ if (!ed_vgroup_transfer_weight(ob_act,
ob_slc, BLI_findlink(&ob_slc->defbase, ob_slc->actdef - 1),
scene,
method, replace_mode, op))
{
fail++;
@@ -3318,7 +3320,7 @@
case WT_REPLACE_ALL_VERTEX_GROUPS:
for (dg_src = ob_slc->defbase.first;
dg_src; dg_src = dg_src->next) {
- if
(!ED_vgroup_transfer_weight(ob_act, ob_slc, dg_src, scene, method,
replace_mode, op))
+ if
(!ed_vgroup_transfer_weight(ob_act, ob_slc, dg_src, scene, method,
replace_mode, op))
{
fail++;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
