From 512b7383525d7b9ccdca93816a08a579db148f23 Mon Sep 17 00:00:00 2001 From: Antony Riakiotakis Date: Thu, 28 Aug 2014 15:48:26 +0200 Subject: Texture paint system: * Add ability to choose blend type and enable/disable toggle for each slot for blender internal. --- release/scripts/startup/bl_ui/space_view3d_toolbar.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'release/scripts') diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 31e7f606770..59c68fc615d 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -994,11 +994,13 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel): class TEXTURE_UL_texpaintslots(UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): - # ma = data - ima = item + mat = data if self.layout_type in {'DEFAULT', 'COMPACT'}: layout.prop(item, "name", text="", emboss=False, icon_value=icon) + if (not mat.use_nodes) and (context.scene.render.engine == 'BLENDER_RENDER'): + mtex_index = mat.texture_paint_slots[index].index + layout.prop(mat, "use_textures", text="", index=mtex_index) elif self.layout_type in {'GRID'}: layout.alignment = 'CENTER' layout.label(text="") @@ -1045,6 +1047,7 @@ class VIEW3D_PT_slots_projectpaint(View3DPanel, Panel): if mat.texture_paint_slots: slot = mat.texture_paint_slots[mat.paint_active_slot] + col.prop(mat.texture_slots[slot.index], "blend_type") col.separator() col.label("UV Map") col.prop_search(slot, "uv_layer", ob.data, "uv_textures", text="") -- cgit v1.2.3