Revision: 26286
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26286
Author: blendix
Date: 2010-01-26 12:11:53 +0100 (Tue, 26 Jan 2010)
Log Message:
-----------
Assign automatic/envelope weights in weight paint mode is back,
accessible from W key and in new Weights menu in the header.
Modified Paths:
--------------
trunk/blender/release/scripts/ui/space_view3d.py
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/poseobject.c
trunk/blender/source/blender/editors/include/ED_armature.h
trunk/blender/source/blender/editors/object/object_relations.c
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py 2010-01-26 10:52:42 UTC
(rev 26285)
+++ trunk/blender/release/scripts/ui/space_view3d.py 2010-01-26 11:11:53 UTC
(rev 26286)
@@ -49,7 +49,7 @@
if edit_object:
sub.menu("VIEW3D_MT_edit_%s" % edit_object.type.lower())
elif obj:
- if mode_string not in ('PAINT_WEIGHT', 'PAINT_TEXTURE'):
+ if mode_string not in ('PAINT_TEXTURE'):
sub.menu("VIEW3D_MT_%s" % mode_string.lower())
else:
sub.menu("VIEW3D_MT_object")
@@ -848,7 +848,25 @@
layout.operator("object.vertex_group_remove", text="Remove Active
Group")
layout.operator("object.vertex_group_remove", text="Remove All
Groups").all = True
+# ********** Weight paint menu **********
+class VIEW3D_MT_paint_weight(bpy.types.Menu):
+ bl_label = "Weights"
+
+ def draw(self, context):
+ layout = self.layout
+
+ layout.operator("paint.weight_from_bones", text="Assign Automatic From
Bones").type = 'AUTOMATIC'
+ layout.operator("paint.weight_from_bones", text="Assign From Bone
Envelopes").type = 'ENVELOPES'
+
+ layout.separator()
+
+ layout.operator("object.vertex_group_normalize_all", text="Normalize
All")
+ layout.operator("object.vertex_group_normalize", text="Normalize")
+ layout.operator("object.vertex_group_invert", text="Invert")
+ layout.operator("object.vertex_group_clean", text="Clean")
+ layout.operator("object.vertex_group_levels", text="Levels")
+
# ********** Sculpt menu **********
@@ -1978,8 +1996,8 @@
bpy.types.register(VIEW3D_MT_vertex_group)
bpy.types.register(VIEW3D_MT_sculpt) # Sculpt Menu
-
bpy.types.register(VIEW3D_MT_paint_vertex)
+bpy.types.register(VIEW3D_MT_paint_weight)
bpy.types.register(VIEW3D_MT_particle)# Particle Menu
bpy.types.register(VIEW3D_MT_particle_specials)
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- trunk/blender/source/blender/editors/armature/editarmature.c
2010-01-26 10:52:42 UTC (rev 26285)
+++ trunk/blender/source/blender/editors/armature/editarmature.c
2010-01-26 11:11:53 UTC (rev 26286)
@@ -4774,7 +4774,7 @@
MEM_freeN(verts);
}
-void create_vgroups_from_armature(Scene *scene, Object *ob, Object *par, int
mode)
+void create_vgroups_from_armature(Scene *scene, Object *ob, Object *par, int
mode, int mirror)
{
/* Lets try to create some vertex groups
* based on the bones of the parent armature.
@@ -4795,7 +4795,7 @@
* that are populated with the vertices for which the
* bone is closest.
*/
- add_verts_to_dgroups(scene, ob, par, (mode == ARM_GROUPS_AUTO),
0);
+ add_verts_to_dgroups(scene, ob, par, (mode == ARM_GROUPS_AUTO),
mirror);
}
}
/* ************* Clear Pose *****************************/
Modified: trunk/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- trunk/blender/source/blender/editors/armature/poseobject.c 2010-01-26
10:52:42 UTC (rev 26285)
+++ trunk/blender/source/blender/editors/armature/poseobject.c 2010-01-26
11:11:53 UTC (rev 26286)
@@ -1115,32 +1115,7 @@
/* ********************************************** */
-/* context weightpaint and deformer in posemode */
-void pose_adds_vgroups(Scene *scene, Object *meshobj, int heatweights)
-{
-// XXX extern VPaint Gwp; /* from vpaint */
- Object *poseobj= modifiers_isDeformedByArmature(meshobj);
- if(poseobj==NULL || (poseobj->mode & OB_MODE_POSE)==0) {
- error("The active object must have a deforming armature in pose
mode");
- return;
- }
-
-// XXX add_verts_to_dgroups(meshobj, poseobj, heatweights, ((Mesh
*)(meshobj->data))->editflag & ME_EDIT_MIRROR_X);
-
- if(heatweights)
- BIF_undo_push("Apply Bone Heat Weights to Vertex Groups");
- else
- BIF_undo_push("Apply Bone Envelopes to Vertex Groups");
-
-
- // and all its relations
- DAG_id_flush_update(&meshobj->id, OB_RECALC_DATA);
-}
-
-/* ********************************************** */
-
-
static int pose_group_add_exec (bContext *C, wmOperator *op)
{
ScrArea *sa= CTX_wm_area(C);
Modified: trunk/blender/source/blender/editors/include/ED_armature.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_armature.h 2010-01-26
10:52:42 UTC (rev 26285)
+++ trunk/blender/source/blender/editors/include/ED_armature.h 2010-01-26
11:11:53 UTC (rev 26286)
@@ -129,7 +129,7 @@
#define ARM_GROUPS_ENVELOPE 2
#define ARM_GROUPS_AUTO 3
-void create_vgroups_from_armature(struct Scene *scene, struct Object *ob,
struct Object *par, int mode);
+void create_vgroups_from_armature(struct Scene *scene, struct Object *ob,
struct Object *par, int mode, int mirror);
void auto_align_armature(struct Scene *scene, struct View3D *v3d, short mode);
void unique_editbone_name(struct ListBase *ebones, char *name, EditBone
*bone); /* if bone is already in list, pass it as param to ignore it */
Modified: trunk/blender/source/blender/editors/object/object_relations.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_relations.c
2010-01-26 10:52:42 UTC (rev 26285)
+++ trunk/blender/source/blender/editors/object/object_relations.c
2010-01-26 11:11:53 UTC (rev 26286)
@@ -630,11 +630,11 @@
}
else if(pararm && ob->type==OB_MESH &&
par->type == OB_ARMATURE) {
if(partype == PAR_ARMATURE_NAME)
-
create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_NAME);
+
create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_NAME, 0);
else if(partype ==
PAR_ARMATURE_ENVELOPE)
-
create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_ENVELOPE);
+
create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_ENVELOPE, 0);
else if(partype == PAR_ARMATURE_AUTO)
-
create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_AUTO);
+
create_vgroups_from_armature(scene, ob, par, ARM_GROUPS_AUTO, 0);
/* get corrected inverse */
ob->partype= PAROBJECT;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
2010-01-26 10:52:42 UTC (rev 26285)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
2010-01-26 11:11:53 UTC (rev 26286)
@@ -64,6 +64,7 @@
/* paint_vertex.c */
int weight_paint_poll(struct bContext *C);
+int weight_paint_mode_poll(struct bContext *C);
int vertex_paint_poll(struct bContext *C);
int vertex_paint_mode_poll(struct bContext *C);
@@ -74,6 +75,7 @@
void PAINT_OT_weight_paint_radial_control(struct wmOperatorType *ot);
void PAINT_OT_weight_paint(struct wmOperatorType *ot);
void PAINT_OT_weight_set(struct wmOperatorType *ot);
+void PAINT_OT_weight_from_bones(struct wmOperatorType *ot);
void PAINT_OT_vertex_paint_radial_control(struct wmOperatorType *ot);
void PAINT_OT_vertex_paint_toggle(struct wmOperatorType *ot);
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
2010-01-26 10:52:42 UTC (rev 26285)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_ops.c
2010-01-26 11:11:53 UTC (rev 26286)
@@ -127,6 +127,7 @@
WM_operatortype_append(PAINT_OT_weight_paint_radial_control);
WM_operatortype_append(PAINT_OT_weight_paint);
WM_operatortype_append(PAINT_OT_weight_set);
+ WM_operatortype_append(PAINT_OT_weight_from_bones);
/* vertex */
WM_operatortype_append(PAINT_OT_vertex_paint_radial_control);
@@ -263,7 +264,7 @@
/* Vertex Paint mode */
keymap= WM_keymap_find(keyconf, "Vertex Paint", 0, 0);
- keymap->poll= vertex_paint_poll;
+ keymap->poll= vertex_paint_mode_poll;
RNA_enum_set(WM_keymap_add_item(keymap,
"PAINT_OT_vertex_paint_radial_control", FKEY, KM_PRESS, 0, 0)->ptr, "mode",
WM_RADIALCONTROL_SIZE);
RNA_enum_set(WM_keymap_add_item(keymap,
"PAINT_OT_vertex_paint_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr,
"mode", WM_RADIALCONTROL_STRENGTH);
@@ -281,7 +282,7 @@
/* Weight Paint mode */
keymap= WM_keymap_find(keyconf, "Weight Paint", 0, 0);
- keymap->poll= weight_paint_poll;
+ keymap->poll= weight_paint_mode_poll;
RNA_enum_set(WM_keymap_add_item(keymap,
"PAINT_OT_weight_paint_radial_control", FKEY, KM_PRESS, 0, 0)->ptr, "mode",
WM_RADIALCONTROL_SIZE);
RNA_enum_set(WM_keymap_add_item(keymap,
"PAINT_OT_weight_paint_radial_control", FKEY, KM_PRESS, KM_SHIFT, 0)->ptr,
"mode", WM_RADIALCONTROL_STRENGTH);
@@ -297,6 +298,8 @@
kmi = WM_keymap_add_item(keymap, "WM_OT_context_toggle", MKEY,
KM_PRESS, 0, 0); /* mask toggle */
RNA_string_set(kmi->ptr, "path",
"weight_paint_object.data.use_paint_mask");
+ WM_keymap_verify_item(keymap, "PAINT_OT_weight_from_bones", WKEY,
KM_PRESS, 0, 0);
+
/* Image/Texture Paint mode */
keymap= WM_keymap_find(keyconf, "Image Paint", 0, 0);
keymap->poll= image_texture_paint_poll;
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2010-01-26 10:52:42 UTC (rev 26285)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
2010-01-26 11:11:53 UTC (rev 26286)
@@ -88,6 +88,7 @@
#include "BIF_gl.h"
#include "BIF_glutil.h"
+#include "ED_armature.h"
#include "ED_mesh.h"
#include "ED_object.h"
#include "ED_screen.h"
@@ -135,6 +136,13 @@
return 0;
}
+int weight_paint_mode_poll(bContext *C)
+{
+ Object *ob = CTX_data_active_object(C);
+
+ return ob && ob->mode == OB_MODE_WEIGHT_PAINT;
+}
+
int weight_paint_poll(bContext *C)
{
Object *ob = CTX_data_active_object(C);
@@ -1980,3 +1988,51 @@
RNA_def_collection_runtime(ot->srna, "stroke",
&RNA_OperatorStrokeElement, "Stroke", "");
}
+/* ********************** weight from bones operator ******************* */
+
+static int weight_from_bones_poll(bContext *C)
+{
+ Object *ob= CTX_data_active_object(C);
+
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
