diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-03 19:23:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-03 19:23:33 +0400 |
| commit | 9f33496088e6373600641b8471fe487aa1587e75 (patch) | |
| tree | ece8b7100e8a83cb46b38813eab4bdf06ffb2580 /release | |
| parent | c1dcaa5decf2a9afcbc7b02b482b599d07510053 (diff) | |
2.5
* Lattices: properties editable, editmode operators, menus working
again. As a bonus you can now edit u/v/w in editmode.
* Shape Keys: some code cleanup, and added more buttons. The
value/min/max buttons don't work correct yet though.
* Fix issue with uv textures, vertex colors not being visible outside
editmode, and a few other issue. Mesh.edit_mesh is now NULL when
not in editmode.
Diffstat (limited to 'release')
| -rw-r--r-- | release/ui/buttons_data_lattice.py | 2 | ||||
| -rw-r--r-- | release/ui/buttons_data_mesh.py | 40 |
2 files changed, 35 insertions, 7 deletions
diff --git a/release/ui/buttons_data_lattice.py b/release/ui/buttons_data_lattice.py index bf2aaad5a97..653a638c458 100644 --- a/release/ui/buttons_data_lattice.py +++ b/release/ui/buttons_data_lattice.py @@ -48,7 +48,7 @@ class DATA_PT_lattice(DataButtonsPanel): row.itemR(lat, "interpolation_type_w", expand=True) row = layout.row() + row.itemO("LATTICE_OT_make_regular") row.itemR(lat, "outside") - row.itemR(lat, "shape_keys") bpy.types.register(DATA_PT_lattice) diff --git a/release/ui/buttons_data_mesh.py b/release/ui/buttons_data_mesh.py index c7e253d5084..cb3041d5057 100644 --- a/release/ui/buttons_data_mesh.py +++ b/release/ui/buttons_data_mesh.py @@ -131,16 +131,44 @@ class DATA_PT_shape_keys(DataButtonsPanel): def draw(self, context): layout = self.layout ob = context.object - - row = layout.row() - key = ob.data.shape_keys + kb = ob.active_shape_key + row = layout.row() row.template_list(key, "keys", ob, "active_shape_key_index") - col = row.column(align=True) - col.itemO("OBJECT_OT_shape_key_add", icon="ICON_ZOOMIN", text="") - col.itemO("OBJECT_OT_shape_key_remove", icon="ICON_ZOOMOUT", text="") + col = row.column() + + subcol = col.column(align=True) + subcol.itemO("OBJECT_OT_shape_key_add", icon="ICON_ZOOMIN", text="") + subcol.itemO("OBJECT_OT_shape_key_remove", icon="ICON_ZOOMOUT", text="") + + if kb: + col.itemS() + + subcol = col.column(align=True) + subcol.itemR(ob, "shape_key_lock", icon="ICON_PINNED", text="") + subcol.itemR(kb, "mute", icon="ICON_MUTE_IPO_ON", text="") + + if key.relative: + row = layout.row() + row.itemR(key, "relative") + row.itemL() + + if ob.active_shape_key_index != 0: + if not ob.shape_key_lock: + row = layout.row(align=True) + row.itemR(kb, "value", text="") + row.itemR(kb, "slider_min", text="Min") + row.itemR(kb, "slider_max", text="Max") + + row = layout.row() + row.item_pointerR(kb, "vertex_group", ob, "vertex_groups", text="") + row.item_pointerR(kb, "relative_key", key, "keys", text="") + else: + row = layout.row() + row.itemR(key, "relative") + row.itemR(key, "slurph") if context.edit_object: layout.enabled = False |