- particle drawing was using invalid memory with weights.

- particle set weight operator (Shift + K) and from the menu.
- mirror vertex groups operator can also flip weight group names.

a number of utility functions for weight groups added
 int *get_defgroup_flip_map(struct Object *ob);
 void flip_vertexgroup_name (char *name_r, const char *name, int strip_number); // moved from modifier.c 
 void copy_defvert (struct MDeformVert *dvert_r, const struct MDeformVert *dvert);
 void flip_defvert (struct MDeformVert *dvert, int *flip_map);

7 files changed, 151 insertions, 3 deletions

diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c
index ab558afe897..412a733dee0 100644
--- a/source/blender/editors/mesh/editmesh_mods.c
+++ b/source/blender/editors/mesh/editmesh_mods.c
@@ -120,7 +120,7 @@ void EM_cache_x_mirror_vert(struct Object *ob, struct EditMesh *em)
 	}
 }
 
-void EM_select_mirrored(Object *obedit, EditMesh *em, int extend)
+static void EM_select_mirrored(Object *obedit, EditMesh *em, int extend)
 {
 
 	EditVert *eve;
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h
index 861b2cc0a6e..cfb4cda2460 100644
--- a/source/blender/editors/object/object_intern.h
+++ b/source/blender/editors/object/object_intern.h
@@ -187,6 +187,7 @@ void OBJECT_OT_vertex_group_levels(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_group_invert(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_group_blend(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_group_clean(struct wmOperatorType *ot);
+void OBJECT_OT_vertex_group_mirror(struct wmOperatorType *ot);
 void OBJECT_OT_vertex_group_set_active(struct wmOperatorType *ot);
 
 void OBJECT_OT_game_property_new(struct wmOperatorType *ot);
diff --git a/source/blender/editors/object/object_ops.c b/source/blender/editors/object/object_ops.c
index 0837051ae0c..8b29e2ca2ae 100644
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@ -173,6 +173,7 @@ void ED_operatortypes_object(void)
 	WM_operatortype_append(OBJECT_OT_vertex_group_levels);
 	WM_operatortype_append(OBJECT_OT_vertex_group_blend);
 	WM_operatortype_append(OBJECT_OT_vertex_group_clean);
+	WM_operatortype_append(OBJECT_OT_vertex_group_mirror);
 	WM_operatortype_append(OBJECT_OT_vertex_group_set_active);
 
 	WM_operatortype_append(OBJECT_OT_game_property_new);
diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c
index 43fabff6793..84b70e0a690 100644
--- a/source/blender/editors/object/object_vgroup.c
+++ b/source/blender/editors/object/object_vgroup.c
@@ -903,6 +903,68 @@ static void vgroup_clean_all(Object *ob, float eul, int keep_single)
 	}
 }
 
+static void vgroup_mirror(Object *ob, int mirror_weights, int flip_vgroups)
+{
+	EditVert *eve, *eve_mirr;
+	MDeformVert *dvert, *dvert_mirr;
+	int	*flip_map;
+
+	if(mirror_weights==0 && flip_vgroups==0)
+		return;
+
+	/* only the active group */
+	if(ob->type == OB_MESH) {
+		Mesh *me= ob->data;
+		EditMesh *em = BKE_mesh_get_editmesh(me);
+
+		EM_cache_x_mirror_vert(ob, em);
+
+		if(!CustomData_has_layer(&em->vdata, CD_MDEFORMVERT))
+			return;
+
+		flip_map= get_defgroup_flip_map(ob);
+
+		/* Go through the list of editverts and assign them */
+		for(eve=em->verts.first; eve; eve=eve->next){
+			if((eve_mirr=eve->tmp.v)) {
+				if(eve_mirr->f & SELECT || eve->f & SELECT) {
+					dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
+					dvert_mirr= CustomData_em_get(&em->vdata, eve_mirr->data, CD_MDEFORMVERT);
+					if(dvert && dvert_mirr) {
+						if(eve_mirr->f & SELECT && eve->f & SELECT) {
+							/* swap */
+							if(mirror_weights)
+								SWAP(MDeformVert, *dvert, *dvert_mirr);
+							if(flip_vgroups) {
+								flip_defvert(dvert, flip_map);
+								flip_defvert(dvert_mirr, flip_map);
+							}
+						}
+						else {
+							/* dvert should always be the target */
+							if(eve_mirr->f & SELECT) {
+								SWAP(MDeformVert *, dvert, dvert_mirr);
+							}
+
+							if(mirror_weights)
+								copy_defvert(dvert, dvert_mirr);
+							if(flip_vgroups) {
+								flip_defvert(dvert, flip_map);
+							}
+						}
+					}
+				}
+
+				eve->tmp.v= eve_mirr->tmp.v= NULL;
+			}
+		}
+
+		MEM_freeN(flip_map);
+
+		BKE_mesh_end_editmesh(me, em);
+	}
+}
+
 static void vgroup_delete_update_users(Object *ob, int id)
 {
 	ExplodeModifierData *emd;
@@ -1026,7 +1088,7 @@ static void vgroup_active_remove_verts(Object *ob, int allverts)
 		for(eve=em->verts.first; eve; eve=eve->next){
 			dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
 		
-			if(dvert && dvert->dw && ((eve->f & 1) || allverts)){
+			if(dvert && dvert->dw && ((eve->f & SELECT) || allverts)){
 				for(i=0; i<dvert->totweight; i++){
 					/* Find group */
 					eg = BLI_findlink(&ob->defbase, dvert->dw[i].def_nr);
@@ -1208,7 +1270,7 @@ static void vgroup_assign_verts(Object *ob, float weight)
 		for(eve=em->verts.first; eve; eve=eve->next){
 			dvert= CustomData_em_get(&em->vdata, eve->data, CD_MDEFORMVERT);
 
-			if(dvert && (eve->f & 1)){
+			if(dvert && (eve->f & SELECT)){
 				done=0;
 				/* See if this vert already has a reference to this group */
 				/*		If so: Change its weight */
@@ -1684,6 +1746,40 @@ void OBJECT_OT_vertex_group_clean(wmOperatorType *ot)
 }
 
 
+static int vertex_group_mirror_exec(bContext *C, wmOperator *op)
+{
+	Object *ob= CTX_data_pointer_get_type(C, "object", &RNA_Object).data;
+
+	vgroup_mirror(ob, RNA_boolean_get(op->ptr,"mirror_weights"), RNA_boolean_get(op->ptr,"flip_group_names"));
+
+	DAG_id_flush_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);
+
+	return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_vertex_group_mirror(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Mirror Vertex Group";
+	ot->idname= "OBJECT_OT_vertex_group_mirror";
+	ot->description= "Mirror weights, and flip vertex group names, copying when only one side is selected.";
+
+	/* api callbacks */
+	ot->poll= vertex_group_poll_edit;
+	ot->exec= vertex_group_mirror_exec;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+
+	/* properties */
+	RNA_def_boolean(ot->srna, "mirror_weights", TRUE, "Mirror Weights", "Mirror weights.");
+	RNA_def_boolean(ot->srna, "flip_group_names", TRUE, "Flip Groups", "Flip vertex group names while mirroring.");
+
+}
+
+
 static int vertex_group_copy_to_linked_exec(bContext *C, wmOperator *op)
 {
 	Scene *scene= CTX_data_scene(C);
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index fe38d71dc92..f0870ca9764 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -2366,6 +2366,52 @@ void PARTICLE_OT_remove_doubles(wmOperatorType *ot)
 	RNA_def_float(ot->srna, "threshold", 0.0002f, 0.0f, FLT_MAX, "Threshold", "Threshold distance withing which particles are removed", 0.00001f, 0.1f);
 }
 
+
+static int weight_set_exec(bContext *C, wmOperator *op)
+{
+	Scene *scene= CTX_data_scene(C);
+	ParticleEditSettings *pset= PE_settings(scene);
+	Object *ob= CTX_data_active_object(C);
+	PTCacheEdit *edit= PE_get_current(scene, ob);
+	ParticleSystem *psys = edit->psys;
+	POINT_P;
+	KEY_K;
+	HairKey *hkey;
+	float weight;
+	ParticleBrushData *brush= &pset->brush[pset->brushtype];
+	edit= psys->edit;
+
+	weight= (float)(brush->strength / 100.0f);
+
+	LOOP_SELECTED_POINTS {
+		ParticleData *pa= psys->particles + p;
+
+		LOOP_SELECTED_KEYS {
+			hkey= pa->hair + k;
+			hkey->weight= weight;
+		}
+	}
+
+	DAG_id_flush_update(&ob->id, OB_RECALC_DATA);
+	WM_event_add_notifier(C, NC_OBJECT|ND_PARTICLE_DATA, ob);
+
+	return OPERATOR_FINISHED;
+}
+
+void PARTICLE_OT_weight_set(wmOperatorType *ot)
+{
+	/* identifiers */
+	ot->name= "Weight Set";
+	ot->idname= "PARTICLE_OT_weight_set";
+
+	/* api callbacks */
+	ot->exec= weight_set_exec;
+	ot->poll= PE_poll;
+
+	/* flags */
+	ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
+}
+
 /************************ cursor drawing *******************************/
 
 static void brush_drawcursor(bContext *C, int x, int y, void *customdata)
diff --git a/source/blender/editors/physics/physics_intern.h b/source/blender/editors/physics/physics_intern.h
index cc0a288f8be..3de5c256df7 100644
--- a/source/blender/editors/physics/physics_intern.h
+++ b/source/blender/editors/physics/physics_intern.h
@@ -50,6 +50,7 @@ void PARTICLE_OT_reveal(struct wmOperatorType *ot);
 void PARTICLE_OT_rekey(struct wmOperatorType *ot);
 void PARTICLE_OT_subdivide(struct wmOperatorType *ot);
 void PARTICLE_OT_remove_doubles(struct wmOperatorType *ot);
+void PARTICLE_OT_weight_set(struct wmOperatorType *ot);
 void PARTICLE_OT_delete(struct wmOperatorType *ot);
 void PARTICLE_OT_mirror(struct wmOperatorType *ot);
 
diff --git a/source/blender/editors/physics/physics_ops.c b/source/blender/editors/physics/physics_ops.c
index 5cb8230e463..2728f64a777 100644
--- a/source/blender/editors/physics/physics_ops.c
+++ b/source/blender/editors/physics/physics_ops.c
@@ -57,6 +57,7 @@ static void operatortypes_particle(void)
 	WM_operatortype_append(PARTICLE_OT_rekey);
 	WM_operatortype_append(PARTICLE_OT_subdivide);
 	WM_operatortype_append(PARTICLE_OT_remove_doubles);
+	WM_operatortype_append(PARTICLE_OT_weight_set);	
 	WM_operatortype_append(PARTICLE_OT_delete);
 	WM_operatortype_append(PARTICLE_OT_mirror);
 
@@ -111,6 +112,8 @@ static void keymap_particle(wmKeyConfig *keyconf)
 	RNA_enum_set(WM_keymap_add_item(keymap, "PARTICLE_OT_brush_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr, "mode", WM_RADIALCONTROL_STRENGTH);
 
 	WM_keymap_add_menu(keymap, "VIEW3D_MT_particle_specials", WKEY, KM_PRESS, 0, 0);
+	
+	WM_keymap_add_item(keymap, "PARTICLE_OT_weight_set", KKEY, KM_PRESS, KM_SHIFT, 0);
 
 	ED_object_generic_keymap(keyconf, keymap, 1);
 }