[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58004] trunk/blender/source/blender/ editors/object/object_vgroup.c: missed change needed in r58003, wasn' t selecting source group properly.

[Campbell Barton]

Revision: 58004
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58004
Author:   campbellbarton
Date:     2013-07-04 19:45:11 +0000 (Thu, 04 Jul 2013)
Log Message:
-----------
missed change needed in r58003, wasn't selecting source group properly.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58003

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	2013-07-04 19:34:49 UTC (rev 58003)
+++ trunk/blender/source/blender/editors/object/object_vgroup.c	2013-07-04 19:45:11 UTC (rev 58004)
@@ -3810,7 +3810,14 @@
 				case WT_REPLACE_ACTIVE_VERTEX_GROUP:
 				{
 					bDeformGroup *dg_src;
-					dg_src = BLI_findlink(&ob_src->defbase, ob_src->actdef - 1);
+					dg_src = defgroup_find_name(ob_src, dg_act_name);
+
+					if (dg_src == NULL) {
+						BKE_reportf(op->reports, RPT_WARNING,
+						            "Skipping object '%s' no group '%s' found", ob_src->id.name + 2, dg_act_name);
+						continue;
+					}
+
 					if (ed_vgroup_transfer_weight(ob_act, ob_src, dg_src, scene, method, replace_mode, op)) {
 						change = true;
 					}
@@ -3857,7 +3864,10 @@
 		return OPERATOR_FINISHED;
 	}
 	else {
-		BKE_report(op->reports, RPT_WARNING, "Failed, no other selected objects with vertex groups found.");
+		if (op->reports->list.first == NULL) {
+			BKE_report(op->reports, RPT_WARNING, "Failed, no other selected objects with vertex groups found.");
+		}
+
 		return OPERATOR_CANCELLED;
 	}
 }