Revision: 24711 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24711 Author: dingto Date: 2009-11-20 21:40:29 +0100 (Fri, 20 Nov 2009)
Log Message: ----------- * More small modifier improvements by nudelZ. * Code cleanup. Modified Paths: -------------- trunk/blender/release/scripts/ui/properties_data_curve.py trunk/blender/release/scripts/ui/properties_data_empty.py trunk/blender/release/scripts/ui/properties_data_lamp.py trunk/blender/release/scripts/ui/properties_data_lattice.py trunk/blender/release/scripts/ui/properties_data_mesh.py trunk/blender/release/scripts/ui/properties_data_metaball.py trunk/blender/release/scripts/ui/properties_data_modifier.py trunk/blender/source/blender/makesrna/intern/rna_modifier.c Modified: trunk/blender/release/scripts/ui/properties_data_curve.py =================================================================== --- trunk/blender/release/scripts/ui/properties_data_curve.py 2009-11-20 19:18:48 UTC (rev 24710) +++ trunk/blender/release/scripts/ui/properties_data_curve.py 2009-11-20 20:40:29 UTC (rev 24711) @@ -106,7 +106,7 @@ if wide_ui: col = split.column() - + if is_surf: sub = col.column(align=True) sub.itemL(text="") @@ -121,7 +121,7 @@ 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 @@ 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 @@ if wide_ui: col = split.column() - col.itemR(curve, "use_radius") col.itemR(curve, "use_time_offset", text="Offset Children") @@ -247,7 +245,6 @@ 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 @@ 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 @@ 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): Modified: trunk/blender/release/scripts/ui/properties_data_empty.py =================================================================== --- trunk/blender/release/scripts/ui/properties_data_empty.py 2009-11-20 19:18:48 UTC (rev 24710) +++ trunk/blender/release/scripts/ui/properties_data_empty.py 2009-11-20 20:40:29 UTC (rev 24711) @@ -44,6 +44,7 @@ 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) Modified: trunk/blender/release/scripts/ui/properties_data_lamp.py =================================================================== --- trunk/blender/release/scripts/ui/properties_data_lamp.py 2009-11-20 19:18:48 UTC (rev 24710) +++ trunk/blender/release/scripts/ui/properties_data_lamp.py 2009-11-20 20:40:29 UTC (rev 24711) @@ -50,7 +50,6 @@ space = context.space_data wide_ui = context.region.width > narrowui - if wide_ui: split = layout.split(percentage=0.65) if ob: Modified: trunk/blender/release/scripts/ui/properties_data_lattice.py =================================================================== --- trunk/blender/release/scripts/ui/properties_data_lattice.py 2009-11-20 19:18:48 UTC (rev 24710) +++ trunk/blender/release/scripts/ui/properties_data_lattice.py 2009-11-20 20:40:29 UTC (rev 24711) @@ -87,8 +87,7 @@ 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) Modified: trunk/blender/release/scripts/ui/properties_data_mesh.py =================================================================== --- trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-11-20 19:18:48 UTC (rev 24710) +++ trunk/blender/release/scripts/ui/properties_data_mesh.py 2009-11-20 20:40:29 UTC (rev 24711) @@ -91,12 +91,9 @@ mesh = context.mesh - split = layout.split() + layout.itemR(mesh, "texture_mesh") - col = split.column() - col.itemR(mesh, "texture_mesh") - class DATA_PT_vertex_groups(DataButtonsPanel): bl_label = "Vertex Groups" Modified: trunk/blender/release/scripts/ui/properties_data_metaball.py =================================================================== --- trunk/blender/release/scripts/ui/properties_data_metaball.py 2009-11-20 19:18:48 UTC (rev 24710) +++ trunk/blender/release/scripts/ui/properties_data_metaball.py 2009-11-20 20:40:29 UTC (rev 24711) @@ -114,7 +114,7 @@ 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 @@ 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) Modified: trunk/blender/release/scripts/ui/properties_data_modifier.py =================================================================== --- trunk/blender/release/scripts/ui/properties_data_modifier.py 2009-11-20 19:18:48 UTC (rev 24710) +++ trunk/blender/release/scripts/ui/properties_data_modifier.py 2009-11-20 20:40:29 UTC (rev 24711) @@ -21,6 +21,7 @@ narrowui = 180 + class DataButtonsPanel(bpy.types.Panel): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -57,6 +58,7 @@ 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 @@ 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 @@ 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 @@ col = split.column() col.itemR(md, "strength") + def EDGE_SPLIT(self, layout, ob, md, wide_ui): split = layout.split() @@ -274,17 +278,19 @@ 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.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") - col = split.column() + if wide_ui: + col = split.column() col.itemR(md, "split_edges") col.itemR(md, "unborn") - - if wide_ui: - col = split.column() col.itemR(md, "alive") col.itemR(md, "dead") @@ -313,23 +319,16 @@ col = split.column() col.itemR(md, "falloff") - + col.itemR(md, "force", slider=True) if wide_ui: col = split.column() - col.itemR(md, "force", slider=True) - - layout.itemS() - - split = layout.split() - - col = split.column() + else: + col.itemS() col.itemO("object.hook_reset", text="Reset") - - if wide_ui: - col = split.column() 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 @@ 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 @@ 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 @@ 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: @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs