[Bf-blender-cvs] [4f74be2] soc-2013-paint: Code cleanup
Campbell Barton
noreply at git.blender.org
Sat Jul 12 12:45:12 CEST 2014
Commit: 4f74be2c56ac041efa765879f87557453963cfeb
Author: Campbell Barton
Date: Sat Jul 12 18:42:28 2014 +1000
https://developer.blender.org/rB4f74be2c56ac041efa765879f87557453963cfeb
Code cleanup
===================================================================
M release/scripts/startup/bl_ui/properties_paint_common.py
M release/scripts/startup/bl_ui/space_image.py
M release/scripts/startup/bl_ui/space_view3d_toolbar.py
M source/blender/editors/sculpt_paint/paint_image.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index 5cdfb2c..8359ae6 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -98,7 +98,7 @@ def brush_texpaint_common(panel, context, layout, brush, settings):
if settings.palette:
col.template_palette(settings, "palette", color=True)
-
+
if brush.use_gradient:
col.label("Gradient Colors")
col.template_color_ramp(brush, "gradient", expand=True)
@@ -139,7 +139,7 @@ def brush_texpaint_common(panel, context, layout, brush, settings):
col.separator()
col.prop(brush, "clone_image", text="Image")
col.prop(brush, "clone_alpha", text="Alpha")
-
+
col.separator()
if capabilities.has_radius:
@@ -172,6 +172,7 @@ def brush_texpaint_common(panel, context, layout, brush, settings):
col.separator()
col.template_ID(settings, "palette", new="palette.new")
+
# Used in both the View3D toolbar and texture properties
def brush_texture_settings(layout, brush, sculpt):
tex_slot = brush.texture_slot
@@ -238,7 +239,7 @@ def brush_mask_texture_settings(layout, brush):
layout.operator("brush.stencil_reset_transform").mask = True
col = layout.column()
- col.prop(brush, "use_pressure_masking", text="");
+ col.prop(brush, "use_pressure_masking", text="")
col.label(text="Angle:")
col.active = brush.brush_capabilities.has_texture_angle
col.prop(mask_tex_slot, "angle", text="")
@@ -247,5 +248,3 @@ def brush_mask_texture_settings(layout, brush):
split = layout.split()
split.prop(mask_tex_slot, "offset")
split.prop(mask_tex_slot, "scale")
-
-
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index fd8e97d..bb911e4 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -37,7 +37,7 @@ class ImagePaintPanel(UnifiedPaintPanel):
class BrushButtonsPanel(UnifiedPaintPanel):
bl_space_type = 'IMAGE_EDITOR'
bl_region_type = 'TOOLS'
-
+
@classmethod
def poll(cls, context):
sima = context.space_data
@@ -158,7 +158,7 @@ class IMAGE_MT_brush(Menu):
# brush tool
layout.prop_menu_enum(brush, "image_tool")
-
+
class IMAGE_MT_image(Menu):
bl_label = "Image"
@@ -696,6 +696,7 @@ class IMAGE_PT_paint(Panel, BrushButtonsPanel):
if brush:
brush_texpaint_common(self, context, layout, brush, settings)
+
class IMAGE_PT_tools_brush_overlay(BrushButtonsPanel, Panel):
bl_label = "Overlay"
bl_options = {'DEFAULT_CLOSED'}
@@ -833,7 +834,7 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel):
row = col.row(align=True)
row.prop(brush, "spacing", text="Spacing")
row.prop(brush, "use_pressure_spacing", toggle=True, text="")
-
+
if brush.use_line or brush.use_curve:
col.separator()
row = col.row(align=True)
@@ -870,6 +871,7 @@ class IMAGE_PT_paint_stroke(BrushButtonsPanel, Panel):
col.prop(toolsettings, "input_samples")
+
class IMAGE_PT_paint_curve(BrushButtonsPanel, Panel):
bl_label = "Paint Curve"
bl_options = {'DEFAULT_CLOSED'}
@@ -922,6 +924,7 @@ class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel):
sub.active = brush.use_custom_icon
sub.prop(brush, "icon_filepath", text="")
+
class IMAGE_PT_tools_paint_options(BrushButtonsPanel, Panel):
bl_label = "Image Paint"
bl_category = "Options"
diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index e5402cf..99b2b85 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -364,6 +364,7 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, Panel):
draw_repeat_tools(context, layout)
+
class VIEW3D_PT_tools_meshweight(View3DPanel, Panel):
bl_category = "Tools"
bl_context = "mesh_edit"
@@ -389,6 +390,7 @@ class VIEW3D_PT_tools_meshweight(View3DPanel, Panel):
layout = self.layout
self.draw_generic(layout)
+
class VIEW3D_PT_tools_add_mesh_edit(View3DPanel, Panel):
bl_category = "Create"
bl_context = "mesh_edit"
@@ -1012,7 +1014,7 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
col.template_palette(settings, "palette", color=True)
self.prop_unified_color(col, context, brush, "color", text="")
- col.separator()
+ col.separator()
row = col.row(align=True)
self.prop_unified_size(row, context, brush, "size", slider=True, text="Radius")
self.prop_unified_size(row, context, brush, "use_pressure_size")
@@ -1022,9 +1024,9 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
self.prop_unified_strength(row, context, brush, "use_pressure_strength")
# XXX - TODO
- #row = col.row(align=True)
- #row.prop(brush, "jitter", slider=True)
- #row.prop(brush, "use_pressure_jitter", toggle=True, text="")
+ # row = col.row(align=True)
+ # row.prop(brush, "jitter", slider=True)
+ # row.prop(brush, "use_pressure_jitter", toggle=True, text="")
col.separator()
col.prop(brush, "vertex_tool", text="Blend")
@@ -1066,12 +1068,16 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
if len(ob.material_slots) > 1:
col.label("Materials")
- col.template_list("MATERIAL_UL_matslots", "", ob, "material_slots", ob, "active_material_index", rows=2)
+ col.template_list("MATERIAL_UL_matslots", "",
+ ob, "material_slots",
+ ob, "active_material_index", rows=2)
mat = ob.active_material
if mat:
col.label("Available Paint Slots")
- col.template_list("TEXTURE_UL_texpaintslots", "", mat, "texture_paint_slots", mat, "paint_active_slot", rows=2)
+ col.template_list("TEXTURE_UL_texpaintslots", "",
+ mat, "texture_paint_slots",
+ mat, "paint_active_slot", rows=2)
if not mat.use_nodes:
col.operator_menu_enum("paint.add_texture_paint_slot", "type")
@@ -1080,10 +1086,12 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel):
row.prop(settings, "slot_xresolution_default")
row.prop(settings, "slot_yresolution_default")
col.prop(settings, "slot_color_default")
-
+
if brush.image_tool == 'CLONE' and settings.use_clone_layer:
col.label("Clone Slot")
- col.template_list("TEXTURE_UL_texpaintslots", "", mat, "texture_paint_slots", mat, "paint_clone_slot", rows=2)
+ col.template_list("TEXTURE_UL_texpaintslots", "",
+ mat, "texture_paint_slots",
+ mat, "paint_clone_slot", rows=2)
class VIEW3D_PT_tools_brush_overlay(Panel, View3DPaintPanel):
@@ -1547,7 +1555,7 @@ class VIEW3D_PT_tools_vertexpaint(Panel, View3DPaintPanel):
col = layout.column()
row = col.row()
- #col.prop(vpaint, "mode", text="")
+ # col.prop(vpaint, "mode", text="")
row.prop(vpaint, "use_normal")
col.prop(vpaint, "use_spray")
diff --git a/source/blender/editors/sculpt_paint/paint_image.c b/source/blender/editors/sculpt_paint/paint_image.c
index 9524a94..e033223 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -124,12 +124,12 @@ typedef struct UndoImageTile {
static ImagePaintPartialRedraw imapaintpartial = {0, 0, 0, 0, 0};
static SpinLock undolock;
-void image_undo_init_locks()
+void image_undo_init_locks(void)
{
BLI_spin_init(&undolock);
}
-void image_undo_end_locks()
+void image_undo_end_locks(void)
{
BLI_spin_end(&undolock);
}
More information about the Bf-blender-cvs
mailing list