After talking with Cambell some more on the IRC I revised my patch(if you
can even call it that.) a fair amount, hopefully this time it will work. I'm
very sorry for my ignorance.. :S
Jonathan
Index: release/scripts/ui/space_view3d_toolbar.py
===================================================================
--- release/scripts/ui/space_view3d_toolbar.py (revision 28201)
+++ release/scripts/ui/space_view3d_toolbar.py (working copy)
@@ -474,11 +474,11 @@
if context.sculpt_object:
return ts.sculpt
- elif context.vertex_paint_object:
- return ts.vertex_paint
- elif context.weight_paint_object:
- return ts.weight_paint
- elif context.texture_paint_object:
+ elif context.paint_vertex_object:
+ return ts.paint_vertex
+ elif context.paint_weight_object:
+ return ts.paint_weight
+ elif context.paint_texture_object:
return ts.image_paint
elif context.particle_edit_object:
return ts.particle_edit
@@ -504,7 +504,7 @@
if context.sculpt_object and brush:
defaultbrushes = 8
- elif context.texture_paint_object and brush:
+ elif context.paint_texture_object and brush:
defaultbrushes = 4
else:
defaultbrushes = 7
@@ -584,7 +584,7 @@
# Texture Paint Mode #
- elif context.texture_paint_object and brush:
+ elif context.paint_texture_object and brush:
col = layout.column()
col.template_color_wheel(brush, "color", value_slider=True)
col.prop(brush, "color", text="")
@@ -610,7 +610,7 @@
# Weight Paint Mode #
- elif context.weight_paint_object and brush:
+ elif context.paint_weight_object and brush:
layout.prop(context.tool_settings, "vertex_group_weight", text="Weight", slider=True)
layout.prop(context.tool_settings, "auto_normalize", text="Auto Normalize")
@@ -629,7 +629,7 @@
# Vertex Paint Mode #
- elif context.vertex_paint_object and brush:
+ elif context.paint_vertex_object and brush:
col = layout.column()
col.template_color_wheel(brush, "color", value_slider=True)
col.prop(brush, "color", text="")
@@ -655,7 +655,7 @@
def poll(self, context):
settings = self.paint_settings(context)
return (settings and settings.brush and (context.sculpt_object or
- context.texture_paint_object))
+ context.paint_texture_object))
def draw(self, context):
layout = self.layout
@@ -679,28 +679,28 @@
def poll(self, context):
settings = self.paint_settings(context)
return (settings and settings.brush and
- (context.sculpt_object or context.texture_paint_object or
- context.vertex_paint_object or context.weight_paint_object))
+ (context.sculpt_object or context.paint_texture_object or
+ context.paint_vertex_object or context.paint_weight_object))
def draw(self, context):
layout = self.layout
settings = self.paint_settings(context)
brush = settings.brush
- texture_paint = context.texture_paint_object
+ texture_paint = context.paint_texture_object
sculpt = context.sculpt_object
col = layout.column(align=True)
if context.sculpt_object:
col.prop(brush, "sculpt_tool", expand=True)
- elif context.texture_paint_object:
+ elif context.paint_texture_object:
col.prop(brush, "imagepaint_tool", expand=True)
#col.prop_enum(settings, "tool", 'DRAW')
#col.prop_enum(settings, "tool", 'SOFTEN')
#col.prop_enum(settings, "tool", 'CLONE')
#col.prop_enum(settings, "tool", 'SMEAR')
- elif context.vertex_paint_object or context.weight_paint_object:
+ elif context.paint_vertex_object or context.paint_weight_object:
col.prop(brush, "vertexpaint_tool", expand=True)
@@ -711,16 +711,16 @@
def poll(self, context):
settings = self.paint_settings(context)
return (settings and settings.brush and (context.sculpt_object or
- context.vertex_paint_object or
- context.weight_paint_object or
- context.texture_paint_object))
+ context.paint_vertex_object or
+ context.paint_weight_object or
+ context.paint_texture_object))
def draw(self, context):
layout = self.layout
settings = self.paint_settings(context)
brush = settings.brush
- texture_paint = context.texture_paint_object
+ paint_texture = context.paint_texture_object
if context.sculpt_object:
if brush.sculpt_tool != 'LAYER':
@@ -732,7 +732,7 @@
col.active = brush.use_airbrush
col.prop(brush, "rate", slider=True)
- if not texture_paint:
+ if not paint_texture:
layout.prop(brush, "use_smooth_stroke")
col = layout.column()
col.active = brush.use_smooth_stroke
@@ -743,7 +743,7 @@
row = layout.row(align=True)
row.active = brush.use_space
row.prop(brush, "spacing", text="Distance", slider=True)
- if texture_paint:
+ if paint_texture:
row.prop(brush, "use_spacing_pressure", toggle=True, text="")
@@ -823,14 +823,14 @@
def draw(self, context):
layout = self.layout
- wpaint = context.tool_settings.weight_paint
+ wpaint = context.tool_settings.paint_weight
col = layout.column()
col.prop(wpaint, "all_faces")
col.prop(wpaint, "normals")
col.prop(wpaint, "spray")
- obj = context.weight_paint_object
+ obj = context.paint_weight_object
if obj.type == 'MESH':
mesh = obj.data
col.prop(mesh, "use_mirror_x")
@@ -855,7 +855,7 @@
def draw(self, context):
layout = self.layout
- vpaint = context.tool_settings.vertex_paint
+ vpaint = context.tool_settings.paint_vertex
col = layout.column()
#col.prop(vpaint, "mode", text="")
Index: release/scripts/ui/space_userpref_keymap.py
===================================================================
--- release/scripts/ui/space_userpref_keymap.py (revision 28201)
+++ release/scripts/ui/space_userpref_keymap.py (working copy)
@@ -44,8 +44,8 @@
('Pose', 'EMPTY', 'WINDOW', []),
- ('Vertex Paint', 'EMPTY', 'WINDOW', []),
- ('Weight Paint', 'EMPTY', 'WINDOW', []),
+ ('Paint Vertex', 'EMPTY', 'WINDOW', []),
+ ('Paint Weight', 'EMPTY', 'WINDOW', []),
('Face Mask', 'EMPTY', 'WINDOW', []),
('Image Paint', 'EMPTY', 'WINDOW', []), # image and view3d
('Sculpt', 'EMPTY', 'WINDOW', []),
Index: source/blender/makesrna/intern/rna_object.c
===================================================================
--- source/blender/makesrna/intern/rna_object.c (revision 28201)
+++ source/blender/makesrna/intern/rna_object.c (working copy)
@@ -47,9 +47,9 @@
{OB_MODE_OBJECT, "OBJECT", ICON_OBJECT_DATAMODE, "Object", ""},
{OB_MODE_EDIT, "EDIT", ICON_EDITMODE_HLT, "Edit", ""},
{OB_MODE_SCULPT, "SCULPT", ICON_SCULPTMODE_HLT, "Sculpt", ""},
- {OB_MODE_VERTEX_PAINT, "VERTEX_PAINT", ICON_VPAINT_HLT, "Vertex Paint", ""},
- {OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""},
- {OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
+ {OB_MODE_PAINT_VERTEX, "PAINT_VERTEX", ICON_VPAINT_HLT, "Vertex Paint", ""},
+ {OB_MODE_PAINT_WEIGHT, "PAINT_WEIGHT", ICON_WPAINT_HLT, "Weight Paint", ""},
+ {OB_MODE_PAINT_TEXTURE, "PAINT_TEXTURE", ICON_TPAINT_HLT, "Texture Paint", ""},
{OB_MODE_PARTICLE_EDIT, "PARTICLE_EDIT", ICON_PARTICLEMODE, "Particle Edit", ""},
{OB_MODE_POSE, "POSE", ICON_POSE_HLT, "Pose", ""},
{0, NULL, 0, NULL, NULL}};
Index: source/blender/editors/sculpt_paint/paint_ops.c
===================================================================
--- source/blender/editors/sculpt_paint/paint_ops.c (revision 28201)
+++ source/blender/editors/sculpt_paint/paint_ops.c (working copy)
@@ -56,9 +56,9 @@
static EnumPropertyItem brush_type_items[] = {
{OB_MODE_SCULPT, "SCULPT", ICON_SCULPTMODE_HLT, "Sculpt", ""},
- {OB_MODE_VERTEX_PAINT, "VERTEX_PAINT", ICON_VPAINT_HLT, "Vertex Paint", ""},
- {OB_MODE_WEIGHT_PAINT, "WEIGHT_PAINT", ICON_WPAINT_HLT, "Weight Paint", ""},
- {OB_MODE_TEXTURE_PAINT, "TEXTURE_PAINT", ICON_TPAINT_HLT, "Texture Paint", ""},
+ {OB_MODE_PAINT_VERTEX, "PAINT_VERTEX", ICON_VPAINT_HLT, "Vertex Paint", ""},
+ {OB_MODE_PAINT_WEIGHT, "PAINT_WEIGHT", ICON_WPAINT_HLT, "Weight Paint", ""},
+ {OB_MODE_PAINT_TEXTURE, "PAINT_TEXTURE", ICON_TPAINT_HLT, "Texture Paint", ""},
{0, NULL, 0, NULL, NULL}};
void BRUSH_OT_add(wmOperatorType *ot)
_______________________________________________
Bf-committers mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-committers
