[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48382] branches/soc-2012-bratwurst: Rename sculpt_paint_capabilities to paint_capabilities, only expose
Antony Riakiotakis
kalast at gmail.com
Thu Jun 28 20:45:35 CEST 2012
Revision: 48382
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48382
Author: psy-fi
Date: 2012-06-28 18:45:33 +0000 (Thu, 28 Jun 2012)
Log Message:
-----------
Rename sculpt_paint_capabilities to paint_capabilities, only expose
mapping options for sculpt brushes (until properly supported, if ever,
for texpaint too)
Modified Paths:
--------------
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_paint_common.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c
Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_paint_common.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_paint_common.py 2012-06-28 18:36:49 UTC (rev 48381)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_paint_common.py 2012-06-28 18:45:33 UTC (rev 48382)
@@ -70,26 +70,27 @@
# Used in both the View3D toolbar and texture properties
-def sculpt_brush_texture_settings(layout, brush):
+def brush_texture_settings(layout, brush, sculpt):
tex_slot = brush.texture_slot
layout.label(text="Brush Mapping:")
# map_mode
- layout.row().prop(tex_slot, "map_mode", text="")
- layout.separator()
+ if sculpt:
+ layout.row().prop(tex_slot, "map_mode", text="")
+ layout.separator()
# angle and texture_angle_source
col = layout.column()
- col.active = brush.sculpt_capabilities.has_texture_angle_source
+ col.active = brush.paint_capabilities.has_texture_angle_source
col.label(text="Angle:")
- if brush.sculpt_capabilities.has_random_texture_angle:
+ if brush.paint_capabilities.has_random_texture_angle:
col.prop(brush, "texture_angle_source_random", text="")
else:
col.prop(brush, "texture_angle_source_no_random", text="")
col = layout.column()
- col.active = brush.sculpt_capabilities.has_texture_angle
+ col.active = brush.paint_capabilities.has_texture_angle
col.prop(tex_slot, "angle", text="")
# scale and offset
Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_texture.py 2012-06-28 18:36:49 UTC (rev 48381)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/properties_texture.py 2012-06-28 18:45:33 UTC (rev 48382)
@@ -30,7 +30,7 @@
from rna_prop_ui import PropertyPanel
-from bl_ui.properties_paint_common import sculpt_brush_texture_settings
+from bl_ui.properties_paint_common import brush_texture_settings
class TEXTURE_MT_specials(Menu):
@@ -867,8 +867,8 @@
split.prop(tex, "object", text="")
if isinstance(idblock, Brush):
- if context.sculpt_object:
- sculpt_brush_texture_settings(layout, idblock)
+ if context.sculpt_object or context.image_paint_object:
+ brush_texture_settings(layout, idblock, context.sculpt_object)
else:
if isinstance(idblock, Material):
split = layout.split(percentage=0.3)
Modified: branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2012-06-28 18:36:49 UTC (rev 48381)
+++ branches/soc-2012-bratwurst/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2012-06-28 18:45:33 UTC (rev 48382)
@@ -20,7 +20,7 @@
import bpy
from bpy.types import Menu, Panel
from bl_ui.properties_paint_common import UnifiedPaintPanel
-from bl_ui.properties_paint_common import sculpt_brush_texture_settings
+from bl_ui.properties_paint_common import brush_texture_settings
class View3DPanel():
@@ -513,7 +513,7 @@
# Sculpt Mode #
elif context.sculpt_object and brush:
- capabilities = brush.sculpt_capabilities
+ capabilities = brush.paint_capabilities
col = layout.column()
@@ -738,11 +738,11 @@
col.prop(brush, "use_fixed_texture")
if context.sculpt_object or context.image_paint_object:
- sculpt_brush_texture_settings(col, brush)
+ brush_texture_settings(col, brush, context.sculpt_object)
# use_texture_overlay and texture_overlay_alpha
col = layout.column(align=True)
- col.active = brush.sculpt_capabilities.has_overlay
+ col.active = brush.paint_capabilities.has_overlay
col.label(text="Overlay:")
row = col.row()
@@ -793,7 +793,7 @@
row.active = brush.use_space
row.prop(brush, "spacing", text="Spacing")
- if brush.sculpt_capabilities.has_smooth_stroke:
+ if brush.paint_capabilities.has_smooth_stroke:
col = layout.column()
col.separator()
@@ -804,7 +804,7 @@
sub.prop(brush, "smooth_stroke_radius", text="Radius", slider=True)
sub.prop(brush, "smooth_stroke_factor", text="Factor", slider=True)
- if brush.sculpt_capabilities.has_jitter:
+ if brush.paint_capabilities.has_jitter:
col.separator()
row = col.row(align=True)
@@ -831,7 +831,7 @@
col.separator()
col = layout.column()
- col.active = brush.sculpt_capabilities.has_spacing
+ col.active = brush.paint_capabilities.has_spacing
col.prop(brush, "use_space")
row = col.row()
@@ -945,7 +945,7 @@
col = layout.column()
if context.sculpt_object and context.tool_settings.sculpt:
- if brush.sculpt_capabilities.has_secondary_color:
+ if brush.paint_capabilities.has_secondary_color:
col.prop(brush, "cursor_color_add", text="Add Color")
col.prop(brush, "cursor_color_subtract", text="Subtract Color")
else:
Modified: branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c 2012-06-28 18:36:49 UTC (rev 48381)
+++ branches/soc-2012-bratwurst/source/blender/makesrna/intern/rna_brush.c 2012-06-28 18:45:33 UTC (rev 48382)
@@ -106,7 +106,7 @@
#include "WM_api.h"
-static int rna_SculptCapabilities_has_accumulate_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_accumulate_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return ELEM6(br->sculpt_tool,
@@ -114,19 +114,19 @@
SCULPT_TOOL_DRAW, SCULPT_TOOL_INFLATE, SCULPT_TOOL_LAYER);
}
-static int rna_SculptCapabilities_has_auto_smooth_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_auto_smooth_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return !ELEM(br->sculpt_tool, SCULPT_TOOL_MASK, SCULPT_TOOL_SMOOTH);
}
-static int rna_SculptCapabilities_has_height_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_height_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return br->sculpt_tool == SCULPT_TOOL_LAYER;
}
-static int rna_SculptCapabilities_has_jitter_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_jitter_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return (!(br->flag & BRUSH_ANCHORED) &&
@@ -136,13 +136,13 @@
SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB));
}
-static int rna_SculptCapabilities_has_normal_weight_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_normal_weight_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return ELEM(br->sculpt_tool, SCULPT_TOOL_GRAB, SCULPT_TOOL_SNAKE_HOOK);
}
-static int rna_SculptCapabilities_has_overlay_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_overlay_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return ELEM(br->mtex.brush_map_mode,
@@ -150,26 +150,26 @@
MTEX_MAP_MODE_TILED);
}
-static int rna_SculptCapabilities_has_persistence_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_persistence_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return br->sculpt_tool == SCULPT_TOOL_LAYER;
}
-static int rna_SculptCapabilities_has_pinch_factor_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_pinch_factor_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return ELEM(br->sculpt_tool, SCULPT_TOOL_BLOB, SCULPT_TOOL_CREASE);
}
-static int rna_SculptCapabilities_has_plane_offset_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_plane_offset_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return ELEM5(br->sculpt_tool, SCULPT_TOOL_CLAY, SCULPT_TOOL_CLAY_STRIPS,
SCULPT_TOOL_FILL, SCULPT_TOOL_FLATTEN, SCULPT_TOOL_SCRAPE);
}
-static int rna_SculptCapabilities_has_random_texture_angle_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_random_texture_angle_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return (ELEM(br->mtex.brush_map_mode,
@@ -181,7 +181,7 @@
SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB));
}
-static int rna_SculptCapabilities_has_sculpt_plane_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_sculpt_plane_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return !ELEM4(br->sculpt_tool, SCULPT_TOOL_INFLATE,
@@ -189,7 +189,7 @@
SCULPT_TOOL_SMOOTH);
}
-static int rna_SculptCapabilities_has_secondary_color_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_secondary_color_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return ELEM10(br->sculpt_tool,
@@ -199,7 +199,7 @@
SCULPT_TOOL_SCRAPE);
}
-static int rna_SculptCapabilities_has_smooth_stroke_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_smooth_stroke_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return (!(br->flag & BRUSH_ANCHORED) &&
@@ -209,7 +209,7 @@
SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB));
}
-static int rna_SculptCapabilities_has_space_attenuation_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_space_attenuation_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return ((br->flag & BRUSH_SPACE) &&
@@ -217,7 +217,7 @@
SCULPT_TOOL_SMOOTH, SCULPT_TOOL_SNAKE_HOOK));
}
-static int rna_SculptCapabilities_has_spacing_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_spacing_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
return (!(br->flag & BRUSH_ANCHORED) &&
@@ -226,13 +226,13 @@
SCULPT_TOOL_SNAKE_HOOK, SCULPT_TOOL_THUMB));
}
-static int rna_SculptCapabilities_has_strength_get(PointerRNA *ptr)
+static int rna_PaintCapabilities_has_strength_get(PointerRNA *ptr)
{
Brush *br = (Brush *)ptr->data;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list