diff options
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/ui/properties_data_curve.py | 21 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_empty.py | 1 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_lamp.py | 1 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_lattice.py | 3 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_mesh.py | 5 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_metaball.py | 8 | ||||
-rw-r--r-- | release/scripts/ui/properties_data_modifier.py | 96 |
7 files changed, 65 insertions, 70 deletions
diff --git a/release/scripts/ui/properties_data_curve.py b/release/scripts/ui/properties_data_curve.py index e563c7e1fe5..754eede2a57 100644 --- a/release/scripts/ui/properties_data_curve.py +++ b/release/scripts/ui/properties_data_curve.py @@ -106,7 +106,7 @@ class DATA_PT_shape_curve(DataButtonsPanel): if wide_ui: col = split.column() - + if is_surf: sub = col.column(align=True) sub.itemL(text="") @@ -121,7 +121,7 @@ class DATA_PT_shape_curve(DataButtonsPanel): sub.itemR(curve, "back") col.itemL(text="Textures:") -# col.itemR(curve, "uv_orco") +# col.itemR(curve, "uv_orco") col.itemR(curve, "auto_texspace") @@ -168,12 +168,11 @@ class DATA_PT_pathanim(DataButtonsPanelCurve): layout.active = curve.use_path - split = layout.split() + row = layout.row() + layout.itemR(curve, "path_length", text="Frames") - col = split.column() - col.itemR(curve, "path_length", text="Frames") if wide_ui: - col = split.column() + row.itemL() split = layout.split() @@ -183,7 +182,6 @@ class DATA_PT_pathanim(DataButtonsPanelCurve): if wide_ui: col = split.column() - col.itemR(curve, "use_radius") col.itemR(curve, "use_time_offset", text="Offset Children") @@ -247,7 +245,6 @@ class DATA_PT_active_spline(DataButtonsPanelActive): sub.itemR(act_spline, "order_v", text="V") sub.itemR(act_spline, "resolution_v", text="V") - if not is_surf: split = layout.split() col = split.column() @@ -257,9 +254,7 @@ class DATA_PT_active_spline(DataButtonsPanelActive): col.itemR(act_spline, "tilt_interpolation", text="Tilt") col.itemR(act_spline, "radius_interpolation", text="Radius") - split = layout.split() - col = split.column() - col.itemR(act_spline, "smooth") + layout.itemR(act_spline, "smooth") class DATA_PT_font(DataButtonsPanel): @@ -312,8 +307,8 @@ class DATA_PT_font(DataButtonsPanel): col.itemR(char, "bold") col.itemR(char, "italic") col.itemR(char, "underline") -# col.itemR(char, "style") -# col.itemR(char, "wrap") +# col.itemR(char, "style") +# col.itemR(char, "wrap") class DATA_PT_paragraph(DataButtonsPanel): diff --git a/release/scripts/ui/properties_data_empty.py b/release/scripts/ui/properties_data_empty.py index 46b500ed086..eb84902b0bd 100644 --- a/release/scripts/ui/properties_data_empty.py +++ b/release/scripts/ui/properties_data_empty.py @@ -44,6 +44,7 @@ class DATA_PT_empty(DataButtonsPanel): layout.itemR(ob, "empty_draw_type", text="Display") else: layout.itemR(ob, "empty_draw_type", text="") + layout.itemR(ob, "empty_draw_size", text="Size") bpy.types.register(DATA_PT_empty) diff --git a/release/scripts/ui/properties_data_lamp.py b/release/scripts/ui/properties_data_lamp.py index 4bc7a830b1e..9a3785415ac 100644 --- a/release/scripts/ui/properties_data_lamp.py +++ b/release/scripts/ui/properties_data_lamp.py @@ -50,7 +50,6 @@ class DATA_PT_context_lamp(DataButtonsPanel): space = context.space_data wide_ui = context.region.width > narrowui - if wide_ui: split = layout.split(percentage=0.65) if ob: diff --git a/release/scripts/ui/properties_data_lattice.py b/release/scripts/ui/properties_data_lattice.py index 0f3d38dc8f4..d4d1ffe34c9 100644 --- a/release/scripts/ui/properties_data_lattice.py +++ b/release/scripts/ui/properties_data_lattice.py @@ -87,8 +87,7 @@ class DATA_PT_lattice(DataButtonsPanel): col = split.column() col.itemR(lat, "interpolation_type_w", text="") - row = layout.row() - row.itemR(lat, "outside") + layout.itemR(lat, "outside") bpy.types.register(DATA_PT_context_lattice) bpy.types.register(DATA_PT_lattice) diff --git a/release/scripts/ui/properties_data_mesh.py b/release/scripts/ui/properties_data_mesh.py index 61aa13114d0..acbeb3552de 100644 --- a/release/scripts/ui/properties_data_mesh.py +++ b/release/scripts/ui/properties_data_mesh.py @@ -91,10 +91,7 @@ class DATA_PT_settings(DataButtonsPanel): mesh = context.mesh - split = layout.split() - - col = split.column() - col.itemR(mesh, "texture_mesh") + layout.itemR(mesh, "texture_mesh") class DATA_PT_vertex_groups(DataButtonsPanel): diff --git a/release/scripts/ui/properties_data_metaball.py b/release/scripts/ui/properties_data_metaball.py index 52ba9a9917a..ceced2b26e4 100644 --- a/release/scripts/ui/properties_data_metaball.py +++ b/release/scripts/ui/properties_data_metaball.py @@ -114,7 +114,7 @@ class DATA_PT_metaball_element(DataButtonsPanel): if wide_ui: col = split.column(align=True) - if metaelem.type == 'CUBE': + if metaelem.type in ('CUBE', 'ELLIPSOID'): col.itemL(text="Size:") col.itemR(metaelem, "size_x", text="X") col.itemR(metaelem, "size_y", text="Y") @@ -129,12 +129,6 @@ class DATA_PT_metaball_element(DataButtonsPanel): col.itemR(metaelem, "size_x", text="X") col.itemR(metaelem, "size_y", text="Y") - elif metaelem.type == 'ELLIPSOID': - col.itemL(text="Size:") - col.itemR(metaelem, "size_x", text="X") - col.itemR(metaelem, "size_y", text="Y") - col.itemR(metaelem, "size_z", text="Z") - bpy.types.register(DATA_PT_context_metaball) bpy.types.register(DATA_PT_metaball) bpy.types.register(DATA_PT_metaball_element) diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 4c04ada3095..28a701d7d5d 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -21,6 +21,7 @@ import bpy narrowui = 180 + class DataButtonsPanel(bpy.types.Panel): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -57,6 +58,7 @@ class DATA_PT_modifiers(DataButtonsPanel): col = split.column() col.itemL(text="Object:") col.itemR(md, "object", text="") + if wide_ui: col = split.column() col.itemL(text="Vertex Group::") @@ -83,7 +85,8 @@ class DATA_PT_modifiers(DataButtonsPanel): layout.itemR(md, "fit_type") else: layout.itemR(md, "fit_type", text="") - + + if md.fit_type == 'FIXED_COUNT': layout.itemR(md, "count") elif md.fit_type == 'FIT_LENGTH': @@ -172,7 +175,7 @@ class DATA_PT_modifiers(DataButtonsPanel): sub.active = md.randomize sub.itemR(md, "seed") - def CAST(self, layout, ob, md, wide_ui): + def CAST(self, layout, ob, md, wide_ui): split = layout.split(percentage=0.25) if wide_ui: @@ -260,6 +263,7 @@ class DATA_PT_modifiers(DataButtonsPanel): col = split.column() col.itemR(md, "strength") + def EDGE_SPLIT(self, layout, ob, md, wide_ui): split = layout.split() @@ -274,17 +278,19 @@ class DATA_PT_modifiers(DataButtonsPanel): col.itemR(md, "use_sharp", text="Sharp Edges") def EXPLODE(self, layout, ob, md, wide_ui): - layout.item_pointerR(md, "vertex_group", ob, "vertex_groups") - layout.itemR(md, "protect") - split = layout.split() - - col = split.column() - col.itemR(md, "split_edges") - col.itemR(md, "unborn") + col = split.column() + col.itemL(text="Vertex group:") + col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="") + sub = col.column() + sub.active = md.vertex_group + sub.itemR(md, "protect") + if wide_ui: col = split.column() + col.itemR(md, "split_edges") + col.itemR(md, "unborn") col.itemR(md, "alive") col.itemR(md, "dead") @@ -313,23 +319,16 @@ class DATA_PT_modifiers(DataButtonsPanel): col = split.column() col.itemR(md, "falloff") - - if wide_ui: - col = split.column() col.itemR(md, "force", slider=True) - - layout.itemS() - - split = layout.split() - - col = split.column() - col.itemO("object.hook_reset", text="Reset") - if wide_ui: col = split.column() + else: + col.itemS() + col.itemO("object.hook_reset", text="Reset") col.itemO("object.hook_recenter", text="Recenter") if ob.mode == 'EDIT': + layout.itemS() row = layout.row() row.itemO("object.hook_select", text="Select") row.itemO("object.hook_assign", text="Assign") @@ -362,11 +361,10 @@ class DATA_PT_modifiers(DataButtonsPanel): sub = col.column() sub.active = md.vertex_group - sub.itemR(md, "inverse", text="Invert") + sub.itemR(md, "invert") def MESH_DEFORM(self, layout, ob, md, wide_ui): split = layout.split() - col = split.column() col.itemL(text="Object:") col.itemR(md, "object", text="") @@ -399,11 +397,10 @@ class DATA_PT_modifiers(DataButtonsPanel): def MIRROR(self, layout, ob, md, wide_ui): layout.itemR(md, "merge_limit") - if wide_ui: split = layout.split(percentage=0.25) else: - split = layout.split() + split = layout.split(percentage=0.4) col = split.column() col.itemL(text="Axis:") @@ -482,39 +479,54 @@ class DATA_PT_modifiers(DataButtonsPanel): layout.itemL(text="See Particle panel.") def SHRINKWRAP(self, layout, ob, md, wide_ui): - layout.itemR(md, "target") - layout.item_pointerR(md, "vertex_group", ob, "vertex_groups") - split = layout.split() col = split.column() - col.itemR(md, "offset") - + col.itemL(text="Target:") + col.itemR(md, "target", text="") if wide_ui: col = split.column() + col.itemL(text="Vertex Group:") + col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="") + + split = layout.split() + + col = split.column() + col.itemR(md, "offset") col.itemR(md, "subsurf_levels") - + if wide_ui: - layout.itemR(md, "mode") + col = split.column() + col.itemL(text="Mode:") + col.itemR(md, "mode", text="") + + if wide_ui: + split = layout.split(percentage=0.25) else: - layout.itemR(md, "mode", text="") - if md.mode == 'PROJECT': - layout.itemR(md, "auxiliary_target") + split = layout.split(percentage=0.35) + col = split.column() - row = layout.row() - row.itemR(md, "x") - row.itemR(md, "y") - row.itemR(md, "z") + if md.mode == 'PROJECT': + col.itemL(text="Axis:") + col.itemR(md, "x") + col.itemR(md, "y") + col.itemR(md, "z") - split = layout.split() col = split.column() col.itemL(text="Direction:") col.itemR(md, "negative") col.itemR(md, "positive") - - col = split.column() + + if wide_ui: + col = split.column() + else: + subsplit = layout.split() + col = subsplit.column() col.itemL(text="Cull Faces:") col.itemR(md, "cull_front_faces", text="Front") col.itemR(md, "cull_back_faces", text="Back") + + layout.itemL(text="Auxiliary Target:") + layout.itemR(md, "auxiliary_target", text="") elif md.mode == 'NEAREST_SURFACEPOINT': layout.itemR(md, "keep_above_surface") @@ -531,8 +543,6 @@ class DATA_PT_modifiers(DataButtonsPanel): col.itemL(text="Vertex Group:") col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="") - layout.itemS() - split = layout.split() col = split.column() |