Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntony Riakiotakis <kalast@gmail.com>2015-07-27 13:55:40 +0300
committerAntony Riakiotakis <kalast@gmail.com>2015-07-27 13:55:57 +0300
commitba146899c8ff40f61819265082781ef4048c631f (patch)
tree35c7b73898119383d6e52052033b2e73ffce8267 /release
parente355d557f83b7925cdee3d05a14849adb19a259a (diff)
Image painting 2D:
Deprecate wrap (BRUSH_TORUS) option, we now have paint flags for tiling and we can reuse those. Also allows seperate tiling in X/Y direction for 2D painting now. Only one tiling is allowed for now. Options can be found in new "Tiling" panel under the tools tab. For version patching, we just turn off brush wrapping, to allow reuse of the flag in the future. New option is paint mode wide instead of per brush so a brush having the old wrap option will not enable it for the whole mode in the version patch.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_image.py22
1 files changed, 18 insertions, 4 deletions
diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py
index 1345a2c51fb..b3fc643cc41 100644
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@ -920,6 +920,24 @@ class IMAGE_PT_paint_curve(BrushButtonsPanel, Panel):
row.operator("brush.curve_preset", icon='NOCURVE', text="").shape = 'MAX'
+class VIEW3D_PT_tools_imagepaint_symmetry(BrushButtonsPanel, Panel):
+ bl_category = "Tools"
+ bl_context = "imagepaint"
+ bl_label = "Tiling"
+ bl_options = {'DEFAULT_CLOSED'}
+
+ def draw(self, context):
+ layout = self.layout
+
+ toolsettings = context.tool_settings
+ ipaint = toolsettings.image_paint
+
+ col = layout.column(align=True)
+ row = col.row(align=True)
+ row.prop(ipaint, "tile_x", text="X", toggle=True)
+ row.prop(ipaint, "tile_y", text="Y", toggle=True)
+
+
class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel):
bl_label = "Appearance"
bl_options = {'DEFAULT_CLOSED'}
@@ -963,10 +981,6 @@ class IMAGE_PT_tools_paint_options(BrushButtonsPanel, Panel):
ups = toolsettings.unified_paint_settings
col = layout.column(align=True)
-
- col.prop(brush, "use_wrap")
- col.separator()
-
col.label(text="Unified Settings:")
row = col.row()
row.prop(ups, "use_unified_size", text="Size")