[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [44637] branches/meshdata_transfer/source/ blender/editors/object/object_vgroup.c: Requested commit.

[Ove Murberg Henriksen]

Revision: 44637
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44637
Author:   cyborgmuppet
Date:     2012-03-04 15:03:59 +0000 (Sun, 04 Mar 2012)
Log Message:
-----------
Requested commit. two wight paint buttons added, code calling functions and empty functions in place. 

Modified Paths:
--------------
    branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c

Modified: branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c	2012-03-04 13:43:23 UTC (rev 44636)
+++ branches/meshdata_transfer/source/blender/editors/object/object_vgroup.c	2012-03-04 15:03:59 UTC (rev 44637)
@@ -1177,15 +1177,18 @@
 	}
 }
 
-static void vgroup_transfer_weight_all(Object *ob_act, Object *ob_other)
+static void vgroup_transfer_weight_all(bContext *C)
 {
 	/* for each vertex group {vgroup_transfer_weight()} */
 	printf("Not implemented yet!");
 }
 
-static void vgroup_transfer_weight(Object *ob_act, Object *ob_other)
+static void vgroup_transfer_weight(bContext *C)
 {
-	printf("not implemented yet!");
+    printf("Not implemented yet!");
+
+
+
 }
 
 static void vgroup_lock_all(Object *ob, int action)
@@ -2378,12 +2381,11 @@
 	                "Keep the values of the active group while normalizing others");
 }
 
-static int vertex_group_transfer_weight_all_exec(bContext *C, wmOperator *op)
+static int vertex_group_transfer_weight_all_exec(const bContext *C, wmOperator *op)
 {
-	Object *ob= ED_object_context(C);
+    Object *ob= CTX_data_active_object(C);
+	vgroup_transfer_weight_all(C);
 
-	vgroup_transfer_weight_all();
-
 	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
@@ -2391,11 +2393,12 @@
 	return OPERATOR_FINISHED;
 }
 
+/* Transfers all vertex groups and weight from active object to targets*/
 void OBJECT_OT_vertex_group_transfer_weight_all(wmOperatorType *ot)
 {
 	/* identifiers */
-	ot->name= "Transfer Weight";
-	ot->idname= "OBJECT_OT_vertex_group_transfer_weight";
+	ot->name= "Transfer Weight All";
+	ot->idname= "OBJECT_OT_vertex_group_transfer_weight_all";
 
 	/* api callbacks */
 	ot->poll= vertex_group_poll;
@@ -2405,12 +2408,11 @@
 	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
 }
 
-static int vertex_group_transfer_weight_exec(bContext *C, wmOperator *op)
+static int vertex_group_transfer_weight_exec(const bContext *C, wmOperator *op)
 {
-	Object *ob= ED_object_context(C);
+    Object *ob= CTX_data_active_object(C);
+	vgroup_transfer_weight(C);
 
-	vgroup_transfer_weight();
-
 	DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 	WM_event_add_notifier(C, NC_OBJECT|ND_DRAW, ob);
 	WM_event_add_notifier(C, NC_GEOM|ND_DATA, ob->data);
@@ -2418,6 +2420,7 @@
 	return OPERATOR_FINISHED;
 }
 
+/* Transfers one vertex group with weight from active object to target*/
 void OBJECT_OT_vertex_group_transfer_weight(wmOperatorType *ot)
 {
 	/* identifiers */