diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_paint_common.py | 5 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 3 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 7 |
3 files changed, 8 insertions, 7 deletions
diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py index 9620666858f..6989139d447 100644 --- a/release/scripts/startup/bl_ui/properties_paint_common.py +++ b/release/scripts/startup/bl_ui/properties_paint_common.py @@ -277,11 +277,10 @@ class TextureMaskPanel(BrushPanel): layout.use_property_decorate = False brush = context.tool_settings.image_paint.brush + mask_tex_slot = brush.mask_texture_slot col = layout.column() - col.template_ID_preview(brush, "mask_texture", new="texture.new", rows=3, cols=8) - - mask_tex_slot = brush.mask_texture_slot + col.template_ID_preview(mask_tex_slot, "texture", new="texture.new", rows=3, cols=8) # map_mode layout.row().prop(mask_tex_slot, "mask_map_mode", text="Mask Mapping") diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 9b5942cbaa9..e7589709130 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -1189,9 +1189,10 @@ class IMAGE_PT_tools_brush_texture(BrushButtonsPanel, Panel): tool_settings = context.tool_settings.image_paint brush = tool_settings.brush + tex_slot = brush.texture_slot col = layout.column() - col.template_ID_preview(brush, "texture", new="texture.new", rows=3, cols=8) + col.template_ID_preview(tex_slot, "texture", new="texture.new", rows=3, cols=8) brush_texture_settings(col, brush, 0) diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 83ab5bf3100..ee8fc1f3531 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -631,10 +631,10 @@ class VIEW3D_PT_tools_brush_texture(Panel, View3DPaintPanel): settings = self.paint_settings(context) brush = settings.brush + tex_slot = brush.texture_slot col = layout.column() - - col.template_ID_preview(brush, "texture", new="texture.new", rows=3, cols=8) + col.template_ID_preview(tex_slot, "texture", new="texture.new", rows=3, cols=8) brush_texture_settings(col, brush, context.sculpt_object) @@ -658,8 +658,9 @@ class VIEW3D_PT_tools_mask_texture(Panel, View3DPaintPanel, TextureMaskPanel): brush = context.tool_settings.image_paint.brush col = layout.column() + mask_tex_slot = brush.mask_texture_slot - col.template_ID_preview(brush, "mask_texture", new="texture.new", rows=3, cols=8) + col.template_ID_preview(mask_tex_slot, "texture", new="texture.new", rows=3, cols=8) brush_mask_texture_settings(col, brush) |