diff options
| author | Ove Murberg Henriksen <sorayasilvermoon@hotmail.com> | 2012-12-16 06:29:46 +0400 |
|---|---|---|
| committer | Ove Murberg Henriksen <sorayasilvermoon@hotmail.com> | 2012-12-16 06:29:46 +0400 |
| commit | 635099fdbca54f861d9cf121fe12d5c6bfa66295 (patch) | |
| tree | 88d3ec27f06f3ab0e7f8801733eb955f9afe40e5 /source/blender/editors | |
| parent | a837d9a8960ed5ec8ff1eb179d52f329a549c56f (diff) | |
Reverting rev 53044 because it broke something and was wrong.
I also added comment to avoid this happening in the future.
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 44d1ccf99ed..69e843ec706 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -447,8 +447,10 @@ static void vgroup_transfer_weight(float *r_weight_dst, const float weight_src, } } -/* 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 @@ static int vertex_group_transfer_weight_exec(bContext *C, wmOperator *op) 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 @@ static int vertex_group_transfer_weight_exec(bContext *C, wmOperator *op) 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++; } |