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>2014-08-28 17:48:26 +0400
committerAntony Riakiotakis <kalast@gmail.com>2014-08-28 17:50:42 +0400
commit512b7383525d7b9ccdca93816a08a579db148f23 (patch)
tree21a46dc1830f3f067dbb73abafa3655f7f62ffb2 /release/scripts
parent2b15c012c24d913c1fa427a69f0c7270c32a39a8 (diff)
Texture paint system:
* Add ability to choose blend type and enable/disable toggle for each slot for blender internal.
Diffstat (limited to 'release/scripts')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d_toolbar.py7
1 files changed, 5 insertions, 2 deletions
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="")