diff options
-rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_mesh.py | 34 |
2 files changed, 35 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 651114a12dc..cd8b3c6677a 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1409,6 +1409,7 @@ def get_panels(): "DATA_PT_context_speaker", "DATA_PT_normals", "DATA_PT_texture_space", + "DATA_PT_ptex", "DATA_PT_curve_texture_space", "DATA_PT_mball_texture_space", "DATA_PT_vertex_groups", diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py index 8efd14afb47..689325929cb 100644 --- a/release/scripts/startup/bl_ui/properties_data_mesh.py +++ b/release/scripts/startup/bl_ui/properties_data_mesh.py @@ -111,6 +111,15 @@ class MESH_UL_uvmaps_vcols(UIList): layout.label(text="", icon_value=icon) +class MESH_UL_ptex(UIList): + def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): + if self.layout_type in {'DEFAULT', 'COMPACT'}: + layout.prop(item, "name", text="", emboss=False, icon_value=icon) + elif self.layout_type in {'GRID'}: + layout.alignment = 'CENTER' + layout.label(text="", icon_value=icon) + + class MeshButtonsPanel: bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -180,6 +189,31 @@ class DATA_PT_texture_space(MeshButtonsPanel, Panel): row.column().prop(mesh, "texspace_size", text="Size") +class DATA_PT_ptex(MeshButtonsPanel, Panel): + bl_label = "Ptex" + COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} + + def draw(self, context): + layout = self.layout + + me = context.mesh + + row = layout.row() + col = row.column() + + col.template_list("MESH_UL_ptex", "loop_ptex", me, "loop_ptex", me.loop_ptex, "active_index", rows=1) + + col = row.column(align=True) + col.operator("mesh.ptex_add", icon='ZOOMIN', text="") + col.operator("mesh.ptex_remove", icon='ZOOMOUT', text="") + + layout.operator("mesh.ptex_res_change", + text='Halve Resolution').mode = 'HALVE' + layout.operator("mesh.ptex_res_change", + text='Double Resolution').mode = 'DOUBLE' + layout.operator("mesh.ptex_import") + + class DATA_PT_vertex_groups(MeshButtonsPanel, Panel): bl_label = "Vertex Groups" COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'} |