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:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-03-01 20:58:12 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2011-03-01 20:58:12 +0300
commit0e8d313f0e92e9b2fed13f5b6a737e8aafcdc25e (patch)
tree8c58912bd305d340226dca0bb70797e79eff16dc /release/scripts/ui
parentf2f52a578a21b0f5e7ec071920effe441c45d021 (diff)
Fix #26218: texture paint
- Added option "Fixed Texture" to the UI. Because of strange reason, this feature was implemented but hidden from users. Would be cool, if somebody familiar with 2d texture paiting check. - Fixed some issues in existing code of fixed texture paiting. It now handles brush radius and curve correct. - Also fixed issue with paiting with texture from node tree - it used to be painted with regular brush color instead of texture.
Diffstat (limited to 'release/scripts/ui')
-rw-r--r--release/scripts/ui/space_image.py1
-rw-r--r--release/scripts/ui/space_view3d_toolbar.py2
2 files changed, 3 insertions, 0 deletions
diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py
index 1927962d90b..171b10aeee1 100644
--- a/release/scripts/ui/space_image.py
+++ b/release/scripts/ui/space_image.py
@@ -685,6 +685,7 @@ class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, bpy.types.Panel):
col = layout.column()
col.template_ID_preview(brush, "texture", new="texture.new", rows=3, cols=8)
+ col.prop(brush, "use_fixed_texture")
class IMAGE_PT_tools_brush_tool(BrushButtonsPanel, bpy.types.Panel):
diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py
index 106cf608554..f849729709f 100644
--- a/release/scripts/ui/space_view3d_toolbar.py
+++ b/release/scripts/ui/space_view3d_toolbar.py
@@ -694,6 +694,8 @@ class VIEW3D_PT_tools_brush_texture(PaintPanel, bpy.types.Panel):
col = layout.column()
col.template_ID_preview(brush, "texture", new="texture.new", rows=3, cols=8)
+ if brush.use_paint_texture:
+ col.prop(brush, "use_fixed_texture")
if context.sculpt_object:
#XXX duplicated from properties_texture.py