diff --git a/release/scripts/ui/properties_data_curve.py b/release/scripts/ui/properties_data_curve.py index 754eede2a57..aa7e586da5d 100644 --- a/release/scripts/ui/properties_data_curve.py +++ b/release/scripts/ui/properties_data_curve.py @@ -112,7 +112,7 @@ class DATA_PT_shape_curve(DataButtonsPanel): sub.itemL(text="") sub.itemR(curve, "resolution_v", text="Preview V") sub.itemR(curve, "render_resolution_v", text="Render V") - + if is_curve or is_text: sub = col.column() sub.active = (curve.dimensions == '2D') @@ -173,7 +173,7 @@ class DATA_PT_pathanim(DataButtonsPanelCurve): if wide_ui: row.itemL() - + split = layout.split() col = split.column() @@ -259,7 +259,7 @@ class DATA_PT_active_spline(DataButtonsPanelActive): class DATA_PT_font(DataButtonsPanel): bl_label = "Font" - + def poll(self, context): return (context.object and context.object.type == 'TEXT' and context.curve) @@ -295,12 +295,12 @@ class DATA_PT_font(DataButtonsPanel): col.itemR(text, "text_on_curve", text="") split = layout.split() - + col = split.column(align=True) col.itemL(text="Underline:") col.itemR(text, "ul_position", text="Position") col.itemR(text, "ul_height", text="Thickness") - + if wide_ui: col = split.column() col.itemL(text="Character:") @@ -322,7 +322,7 @@ class DATA_PT_paragraph(DataButtonsPanel): text = context.curve wide_ui = context.region.width > narrowui - + layout.itemL(text="Align:") if wide_ui: layout.itemR(text, "spacemode", expand=True) @@ -349,7 +349,7 @@ class DATA_PT_textboxes(DataButtonsPanel): def poll(self, context): return (context.object and context.object.type == 'TEXT' and context.curve) - + def draw(self, context): layout = self.layout diff --git a/release/scripts/ui/properties_data_lattice.py b/release/scripts/ui/properties_data_lattice.py index d4d1ffe34c9..e8aeebcf208 100644 --- a/release/scripts/ui/properties_data_lattice.py +++ b/release/scripts/ui/properties_data_lattice.py @@ -21,6 +21,7 @@ import bpy narrowui = 180 + class DataButtonsPanel(bpy.types.Panel): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -72,14 +73,14 @@ class DATA_PT_lattice(DataButtonsPanel): if wide_ui: col = split.column() col.itemR(lat, "interpolation_type_u", text="") - + split = layout.split() col = split.column() col.itemR(lat, "points_v") if wide_ui: col = split.column() col.itemR(lat, "interpolation_type_v", text="") - + split = layout.split() col = split.column() col.itemR(lat, "points_w") diff --git a/release/scripts/ui/properties_data_metaball.py b/release/scripts/ui/properties_data_metaball.py index ceced2b26e4..96bf7246d7e 100644 --- a/release/scripts/ui/properties_data_metaball.py +++ b/release/scripts/ui/properties_data_metaball.py @@ -21,6 +21,7 @@ import bpy narrowui = 180 + class DataButtonsPanel(bpy.types.Panel): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -110,7 +111,7 @@ class DATA_PT_metaball_element(DataButtonsPanel): col.itemR(metaelem, "stiffness", text="Stiffness") col.itemR(metaelem, "negative", text="Negative") col.itemR(metaelem, "hide", text="Hide") - + if wide_ui: col = split.column(align=True) diff --git a/release/scripts/ui/properties_data_modifier.py b/release/scripts/ui/properties_data_modifier.py index 28a701d7d5d..63006b27d15 100644 --- a/release/scripts/ui/properties_data_modifier.py +++ b/release/scripts/ui/properties_data_modifier.py @@ -85,8 +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': @@ -134,7 +134,7 @@ class DATA_PT_modifiers(DataButtonsPanel): def BEVEL(self, layout, ob, md, wide_ui): split = layout.split() - + col = split.column() col.itemR(md, "width") @@ -155,7 +155,7 @@ class DATA_PT_modifiers(DataButtonsPanel): col = split.column() col.itemL(text="Operation:") col.itemR(md, "operation", text="") - + if wide_ui: col = split.column() col.itemL(text="Object:") @@ -175,14 +175,14 @@ 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: split.itemL(text="Cast Type:") split.itemR(md, "cast_type", text="") else: - layout.itemR(md, "cast_type", text="") + layout.itemR(md, "cast_type", text="") split = layout.split(percentage=0.25) @@ -198,16 +198,16 @@ class DATA_PT_modifiers(DataButtonsPanel): col.itemR(md, "from_radius") split = layout.split() - - col = split.column() + + col = split.column() col.itemL(text="Vertex Group:") col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="") if wide_ui: col = split.column() col.itemL(text="Control Object:") - col.itemR(md, "object", text="") + col.itemR(md, "object", text="") if md.object: - col.itemR(md, "use_transform") + col.itemR(md, "use_transform") def CLOTH(self, layout, ob, md, wide_ui): layout.itemL(text="See Cloth panel.") @@ -255,15 +255,14 @@ class DATA_PT_modifiers(DataButtonsPanel): layout.itemS() split = layout.split() - + col = split.column() col.itemR(md, "midlevel") - + if wide_ui: col = split.column() col.itemR(md, "strength") - def EDGE_SPLIT(self, layout, ob, md, wide_ui): split = layout.split() @@ -279,7 +278,7 @@ class DATA_PT_modifiers(DataButtonsPanel): def EXPLODE(self, layout, ob, md, wide_ui): split = layout.split() - + col = split.column() col.itemL(text="Vertex group:") col.item_pointerR(md, "vertex_group", ob, "vertex_groups", text="") @@ -339,7 +338,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:") @@ -390,7 +389,7 @@ class DATA_PT_modifiers(DataButtonsPanel): col = split.column() col.itemR(md, "precision") - + if wide_ui: col = split.column() col.itemR(md, "dynamic") @@ -398,9 +397,9 @@ 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) + split = layout.split(percentage=0.25) else: - split = layout.split(percentage=0.4) + split = layout.split(percentage=0.4) col = split.column() col.itemL(text="Axis:") @@ -412,12 +411,12 @@ class DATA_PT_modifiers(DataButtonsPanel): col = split.column() else: subsplit = layout.split() - col = subsplit.column() + col = subsplit.column() col.itemL(text="Options:") col.itemR(md, "clip", text="Clipping") col.itemR(md, "mirror_vertex_groups", text="Vertex Groups") - col = split.column() + col = split.column() col.itemL(text="Textures:") col.itemR(md, "mirror_u", text="U") col.itemR(md, "mirror_v", text="V") @@ -432,12 +431,12 @@ class DATA_PT_modifiers(DataButtonsPanel): else: layout.row().itemR(md, "subdivision_type", text="") layout.itemR(md, "level") - + split = layout.split() col = split.column() col.itemO("object.multires_subdivide", text="Subdivide") - + if wide_ui: col = split.column() col.itemO("object.multires_higher_levels_delete", text="Delete Higher") @@ -445,7 +444,7 @@ class DATA_PT_modifiers(DataButtonsPanel): def PARTICLE_INSTANCE(self, layout, ob, md, wide_ui): layout.itemR(md, "object") layout.itemR(md, "particle_system_number", text="Particle System") - + split = layout.split() col = split.column() col.itemL(text="Create From:") @@ -459,17 +458,17 @@ class DATA_PT_modifiers(DataButtonsPanel): col.itemR(md, "alive") col.itemR(md, "unborn") col.itemR(md, "dead") - + layout.itemS() - + layout.itemR(md, "path", text="Create Along Paths") - + split = layout.split() split.active = md.path col = split.column() col.row().itemR(md, "axis", expand=True) col.itemR(md, "keep_shape") - + if wide_ui: col = split.column() col.itemR(md, "position", slider=True) @@ -500,9 +499,9 @@ class DATA_PT_modifiers(DataButtonsPanel): col.itemR(md, "mode", text="") if wide_ui: - split = layout.split(percentage=0.25) + split = layout.split(percentage=0.25) else: - split = layout.split(percentage=0.35) + split = layout.split(percentage=0.35) col = split.column() if md.mode == 'PROJECT': @@ -527,7 +526,7 @@ class DATA_PT_modifiers(DataButtonsPanel): layout.itemL(text="Auxiliary Target:") layout.itemR(md, "auxiliary_target", text="") - + elif md.mode == 'NEAREST_SURFACEPOINT': layout.itemR(md, "keep_above_surface") @@ -593,7 +592,7 @@ class DATA_PT_modifiers(DataButtonsPanel): col.itemL(text="Subdivisions:") col.itemR(md, "levels", text="View") col.itemR(md, "render_levels", text="Render") - + if wide_ui: col = split.column() col.itemL(text="Options:") @@ -609,19 +608,19 @@ class DATA_PT_modifiers(DataButtonsPanel): col = split.column() col.itemL(text="UV Layer:") col.item_pointerR(md, "uv_layer", ob.data, "uv_textures", text="") - + if wide_ui: col = split.column() col.itemL(text="Image:") col.itemR(md, "image", text="") - split = layout.split() + split = layout.split() col = split.column() col.itemR(md, "override_image") col.itemR(md, "num_projectors", text="Projectors") for proj in md.projectors: col.itemR(proj, "object", text="") - + if wide_ui: col = split.column() sub = col.column(align=True) @@ -682,7 +681,7 @@ class DATA_PT_modifiers(DataButtonsPanel): col = split.column() col.itemR(md, "speed", slider=True) col.itemR(md, "height", slider=True) - + if wide_ui: col = split.column() col.itemR(md, "width", slider=True) diff --git a/release/scripts/ui/properties_game.py b/release/scripts/ui/properties_game.py index a4730534d6c..150296af070 100644 --- a/release/scripts/ui/properties_game.py +++ b/release/scripts/ui/properties_game.py @@ -21,6 +21,7 @@ import bpy narrowui = 180 + class PhysicsButtonsPanel(bpy.types.Panel): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -186,14 +187,14 @@ class PHYSICS_PT_game_collision_bounds(PhysicsButtonsPanel): layout.itemR(game, "collision_bounds", text="") split = layout.split() - + col = split.column() col.itemR(game, "collision_margin", text="Margin", slider=True) - + if wide_ui: col = split.column() col.itemR(game, "collision_compound", text="Compound") - + bpy.types.register(PHYSICS_PT_game_physics) bpy.types.register(PHYSICS_PT_game_collision_bounds) @@ -302,7 +303,7 @@ class RENDER_PT_game_stereo(RenderButtonsPanel): elif dome_type == 'PANORAM_SPH': col = split.column() - + col.itemR(gs, "dome_buffer_resolution", text="Resolution", slider=True) if wide_ui: col = split.column() @@ -325,7 +326,7 @@ class RENDER_PT_game_shading(RenderButtonsPanel): gs = context.scene.game_data wide_ui = context.region.width > narrowui - + if wide_ui: layout.itemR(gs, "material_mode", expand=True) else: @@ -353,7 +354,7 @@ class RENDER_PT_game_performance(RenderButtonsPanel): gs = context.scene.game_data wide_ui = context.region.width > narrowui - + split = layout.split() col = split.column() @@ -426,12 +427,13 @@ class WORLD_PT_game_context_world(WorldButtonsPanel): split.template_ID(scene, "world", new="world.new") elif world: split.template_ID(space, "pin_id") - else: + else: if scene: layout.template_ID(scene, "world", new="world.new") elif world: layout.template_ID(space, "pin_id") + class WORLD_PT_game_world(WorldButtonsPanel): bl_label = "World" @@ -442,38 +444,40 @@ class WORLD_PT_game_world(WorldButtonsPanel): wide_ui = context.region.width > narrowui split = layout.split() - + col = split.column() col.itemR(world, "horizon_color") - + if wide_ui: col = split.column() col.itemR(world, "ambient_color") + class WORLD_PT_game_mist(WorldButtonsPanel): bl_label = "Mist" - + def draw_header(self, context): world = context.world - + self.layout.itemR(world.mist, "enabled", text="") - + def draw(self, context): layout = self.layout world = context.world wide_ui = context.region.width > narrowui - + layout.active = world.mist.enabled split = layout.split() - + col = split.column() col.itemR(world.mist, "start") - + if wide_ui: col = split.column() col.itemR(world.mist, "depth") + class WORLD_PT_game_physics(WorldButtonsPanel): bl_label = "Physics" @@ -521,4 +525,4 @@ class WORLD_PT_game_physics(WorldButtonsPanel): bpy.types.register(WORLD_PT_game_context_world) bpy.types.register(WORLD_PT_game_world) bpy.types.register(WORLD_PT_game_mist) -bpy.types.register(WORLD_PT_game_physics) \ No newline at end of file +bpy.types.register(WORLD_PT_game_physics) diff --git a/release/scripts/ui/properties_object_constraint.py b/release/scripts/ui/properties_object_constraint.py index 1816be06483..007f9762872 100644 --- a/release/scripts/ui/properties_object_constraint.py +++ b/release/scripts/ui/properties_object_constraint.py @@ -43,7 +43,7 @@ class ConstraintButtonsPanel(bpy.types.Panel): def space_template(self, layout, con, wide_ui, target=True, owner=True): if target or owner: - + split = layout.split(percentage=0.2) if wide_ui: @@ -51,8 +51,8 @@ class ConstraintButtonsPanel(bpy.types.Panel): row = split.row() else: row = layout.row() - - + + if target: row.itemR(con, "target_space", text="") @@ -132,7 +132,7 @@ class ConstraintButtonsPanel(bpy.types.Panel): col = split.column() col.itemO("constraint.childof_set_inverse") - + if wide_ui: col = split.column() col.itemO("constraint.childof_clear_inverse") @@ -149,7 +149,7 @@ class ConstraintButtonsPanel(bpy.types.Panel): col = split.column() col.itemR(con, "up", text="Up") - + if wide_ui: col = split.column() col.itemR(con, "target_z") @@ -189,7 +189,7 @@ class ConstraintButtonsPanel(bpy.types.Panel): sub = col.column() sub.active = con.rotation sub.itemR(con, "orient_weight", text="Rotation", slider=True) - + if wide_ui: col = split.column() col.itemR(con, "tail") @@ -471,7 +471,7 @@ class ConstraintButtonsPanel(bpy.types.Panel): layout.itemR(con, "action") else: layout.itemR(con, "action", text="") - + if wide_ui: layout.itemR(con, "transform_channel") else: @@ -526,7 +526,7 @@ class ConstraintButtonsPanel(bpy.types.Panel): col = split.column() col.itemR(con, "original_length", text="Rest Length") - + if wide_ui: col = split.column() col.itemO("constraint.stretchto_reset", text="Reset") @@ -550,7 +550,7 @@ class ConstraintButtonsPanel(bpy.types.Panel): col = split.column() col.itemR(con, "sticky") - + if wide_ui: col = split.column() col.itemR(con, "use_rotation") @@ -578,7 +578,7 @@ class ConstraintButtonsPanel(bpy.types.Panel): col = split.column() col.itemR(con, "disable_linked_collision", text="No Collision") - + if wide_ui: col = split.column() col.itemR(con, "draw_pivot", text="Display Pivot") @@ -615,13 +615,13 @@ class ConstraintButtonsPanel(bpy.types.Panel): self.target_template(layout, con, wide_ui) layout.itemR(con, "extrapolate_motion", text="Extrapolate") - + col = layout.column() col.row().itemL(text="Source:") col.row().itemR(con, "map_from", expand=True) - + split = layout.split() - + sub = split.column(align=True) sub.itemL(text="X:") sub.itemR(con, "from_min_x", text="Min") @@ -646,29 +646,29 @@ class ConstraintButtonsPanel(bpy.types.Panel): col.row().itemR(con, "map_to", expand=True) split = layout.split() - + col = split.column() col.itemL(text="X:") col.row().itemR(con, "map_to_x_from", expand=True) - + sub = col.column(align=True) sub.itemR(con, "to_min_x", text="Min") sub.itemR(con, "to_max_x", text="Max") - + if wide_ui: col = split.column() col.itemL(text="Y:") col.row().itemR(con, "map_to_y_from", expand=True) - + sub = col.column(align=True) sub.itemR(con, "to_min_y", text="Min") sub.itemR(con, "to_max_y", text="Max") - + if wide_ui: col = split.column() col.itemL(text="Z:") col.row().itemR(con, "map_to_z_from", expand=True) - + sub = col.column(align=True) sub.itemR(con, "to_min_z", text="Min") sub.itemR(con, "to_max_z", text="Max") @@ -866,11 +866,11 @@ class BONE_PT_iksolver_itasc(ConstraintButtonsPanel): split.active = not simulation or itasc.reiteration != 'NEVER' col = split.column() col.itemR(itasc, "precision") - + if wide_ui: col = split.column() col.itemR(itasc, "num_iter") - + if simulation: layout.itemR(itasc, "auto_step") diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py index b8ecc74602e..2486c5c2b6c 100644 --- a/release/scripts/ui/properties_physics_common.py +++ b/release/scripts/ui/properties_physics_common.py @@ -23,7 +23,7 @@ narrowui = 180 def point_cache_ui(self, context, cache, enabled, particles, smoke): layout = self.layout - + wide_ui = context.region.width > narrowui layout.set_context_pointer("PointCache", cache) @@ -92,22 +92,22 @@ def point_cache_ui(self, context, cache, enabled, particles, smoke): def effector_weights_ui(self, context, weights): layout = self.layout - + wide_ui = context.region.width > narrowui layout.itemR(weights, "group") split = layout.split() - + col = split.column() col.itemR(weights, "gravity", slider=True) - + if wide_ui: col = split.column() col.itemR(weights, "all", slider=True) layout.itemS() - + split = layout.split() col = split.column() @@ -130,9 +130,9 @@ def effector_weights_ui(self, context, weights): def basic_force_field_settings_ui(self, context, field): layout = self.layout - + wide_ui = context.region.width > narrowui - + split = layout.split() if not field or field.type == 'NONE': @@ -156,7 +156,7 @@ def basic_force_field_settings_ui(self, context, field): col.itemR(field, "quadratic_drag", text="Quadratic") else: col.itemR(field, "flow") - + if wide_ui: col = split.column() col.itemR(field, "noise") @@ -170,7 +170,7 @@ def basic_force_field_settings_ui(self, context, field): col.itemL(text="Effect point:") col.itemR(field, "do_location") col.itemR(field, "do_rotation") - + if wide_ui: col = split.column() col.itemL(text="Collision:") @@ -179,10 +179,10 @@ def basic_force_field_settings_ui(self, context, field): def basic_force_field_falloff_ui(self, context, field): layout = self.layout - + wide_ui = context.region.width > narrowui - - # XXX: This doesn't update for some reason. + + # XXX: This doesn't update for some reason. #if wide_ui: # split = layout.split() #else: diff --git a/release/scripts/ui/properties_physics_field.py b/release/scripts/ui/properties_physics_field.py index 237160030d5..9f895c1a487 100644 --- a/release/scripts/ui/properties_physics_field.py +++ b/release/scripts/ui/properties_physics_field.py @@ -61,7 +61,7 @@ class PHYSICS_PT_field(PhysicButtonsPanel): else: split = layout.split() split.itemR(field, "shape", text="") - + split = layout.split() if field.type == 'NONE': @@ -72,7 +72,7 @@ class PHYSICS_PT_field(PhysicButtonsPanel): col.itemR(field, "guide_free") col.itemR(field, "falloff_power") col.itemR(field, "guide_path_add") - + if wide_ui: col = split.column() col.itemL(text="Clumping:") @@ -92,11 +92,11 @@ class PHYSICS_PT_field(PhysicButtonsPanel): layout.itemR(field, "guide_kink_axis") split = layout.split() - + col = split.column() col.itemR(field, "guide_kink_frequency") col.itemR(field, "guide_kink_shape") - + if wide_ui: col = split.column() col.itemR(field, "guide_kink_amplitude") @@ -107,7 +107,7 @@ class PHYSICS_PT_field(PhysicButtonsPanel): col.itemR(field, "texture", text="") col.itemR(field, "texture_mode", text="") col.itemR(field, "texture_nabla") - + if wide_ui: col = split.column() col.itemR(field, "use_coordinates") @@ -132,7 +132,7 @@ class PHYSICS_PT_field(PhysicButtonsPanel): col.itemL(text="Angular:") col.itemR(field, "use_radial_min", text="Use Minimum") col.itemR(field, "use_radial_max", text="Use Maximum") - + if wide_ui: col = split.column() col.itemR(field, "radial_falloff", text="Power") @@ -154,7 +154,7 @@ class PHYSICS_PT_field(PhysicButtonsPanel): col.itemL(text="Radial:") col.itemR(field, "use_radial_min", text="Use Minimum") col.itemR(field, "use_radial_max", text="Use Maximum") - + if wide_ui: col = split.column() col.itemR(field, "radial_falloff", text="Power") diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py index 492f9879c00..88fb4c974fb 100644 --- a/release/scripts/ui/properties_physics_fluid.py +++ b/release/scripts/ui/properties_physics_fluid.py @@ -111,7 +111,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel): col.itemL(text="Volume Initialization:") col.itemR(fluid, "volume_initialization", text="") col.itemR(fluid, "export_animated_mesh") - + if wide_ui: col = split.column() col.itemL(text="Initial Velocity:") diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py index 8a7d65b7d8c..02244ef71ab 100644 --- a/release/scripts/ui/properties_physics_softbody.py +++ b/release/scripts/ui/properties_physics_softbody.py @@ -80,7 +80,7 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel): col.itemR(softbody, "friction") col.itemR(softbody, "mass") col.item_pointerR(softbody, "mass_vertex_group", ob, "vertex_groups", text="Mass:") - + if wide_ui: col = split.column() col.itemL(text="Simulation:") @@ -133,7 +133,7 @@ class PHYSICS_PT_softbody_goal(PhysicButtonsPanel): sub = col.column(align=True) sub.itemR(softbody, "goal_min", text="Minimum") sub.itemR(softbody, "goal_max", text="Maximum") - + if wide_ui: col = split.column() col.itemL(text="Goal Settings:") @@ -177,7 +177,7 @@ class PHYSICS_PT_softbody_edge(PhysicButtonsPanel): col.itemR(softbody, "bending") col.itemR(softbody, "spring_length", text="Length") col.item_pointerR(softbody, "spring_vertex_group", ob, "vertex_groups", text="Springs:") - + if wide_ui: col = split.column() col.itemR(softbody, "stiff_quads") @@ -254,7 +254,7 @@ class PHYSICS_PT_softbody_solver(PhysicButtonsPanel): col.itemR(softbody, "minstep") col.itemR(softbody, "maxstep") col.itemR(softbody, "auto_step", text="Auto-Step") - + if wide_ui: col = split.column() col.itemR(softbody, "error_limit") @@ -276,7 +276,7 @@ class PHYSICS_PT_softbody_field_weights(PhysicButtonsPanel): def draw(self, context): md = context.soft_body softbody = md.settings - + effector_weights_ui(self, context, softbody.effector_weights) bpy.types.register(PHYSICS_PT_softbody) diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py index 3a6a37062b5..6874956b445 100644 --- a/release/scripts/ui/properties_render.py +++ b/release/scripts/ui/properties_render.py @@ -379,7 +379,7 @@ class RENDER_PT_encoding(RenderButtonsPanel): wide_ui = context.region.width > narrowui split = layout.split() - + col = split.column() col.itemR(rd, "ffmpeg_format") if rd.ffmpeg_format in ('AVI', 'QUICKTIME', 'MKV', 'OGG'): @@ -397,7 +397,7 @@ class RENDER_PT_encoding(RenderButtonsPanel): if wide_ui: col = split.column() col.itemR(rd, "ffmpeg_gopsize") - + split = layout.split() col = split.column() @@ -408,7 +408,7 @@ class RENDER_PT_encoding(RenderButtonsPanel): if wide_ui: col = split.column() - + col.itemR(rd, "ffmpeg_autosplit") col.itemL(text="Mux:") col.itemR(rd, "ffmpeg_muxrate", text="Rate") @@ -430,6 +430,7 @@ class RENDER_PT_encoding(RenderButtonsPanel): col.itemR(rd, "ffmpeg_multiplex_audio") col.itemR(rd, "ffmpeg_audio_volume", slider=True) + class RENDER_PT_antialiasing(RenderButtonsPanel): bl_label = "Anti-Aliasing" COMPAT_ENGINES = set(['BLENDER_RENDER']) diff --git a/release/scripts/ui/space_console.py b/release/scripts/ui/space_console.py index e4d65e8eff6..9cd95c0c262 100644 --- a/release/scripts/ui/space_console.py +++ b/release/scripts/ui/space_console.py @@ -88,7 +88,7 @@ class CONSOLE_MT_language(bpy.types.Menu): def draw(self, context): import sys - + layout = self.layout layout.column() @@ -161,7 +161,7 @@ class ConsoleBanner(bpy.types.Operator): if not sc.language: sc.language = 'python' - module = __import__("console_" + sc.language) + module = __import__("console_" + sc.language) banner = getattr(module, "banner", None) if banner: diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index 16208d5e0d5..d00babbefb1 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -21,6 +21,7 @@ import bpy narrowui = 180 + class IMAGE_MT_view(bpy.types.Menu): bl_label = "View" @@ -409,7 +410,7 @@ class IMAGE_PT_view_properties(bpy.types.Panel): col.itemR(uvedit, "draw_modified_edges", text="Modified") #col.itemR(uvedit, "draw_edges") #col.itemR(uvedit, "draw_faces") - + if wide_ui: col = split.column() col.itemR(uvedit, "draw_stretch", text="Stretch") @@ -417,6 +418,7 @@ class IMAGE_PT_view_properties(bpy.types.Panel): sub.active = uvedit.draw_stretch sub.row().itemR(uvedit, "draw_stretch_type", expand=True) + class IMAGE_PT_paint(bpy.types.Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' diff --git a/release/scripts/ui/space_node.py b/release/scripts/ui/space_node.py index ad7ed6e796a..807b7f6628f 100644 --- a/release/scripts/ui/space_node.py +++ b/release/scripts/ui/space_node.py @@ -108,7 +108,7 @@ class NODE_MT_node(bpy.types.Menu): layout.itemO("tfm.translate") layout.itemO("tfm.rotate") layout.itemO("tfm.resize") - + layout.itemS() layout.itemO("node.duplicate_move") @@ -116,7 +116,7 @@ class NODE_MT_node(bpy.types.Menu): layout.itemS() layout.itemO("node.link_make") - + layout.itemS() layout.itemO("node.group_edit") layout.itemO("node.group_ungroup") @@ -129,9 +129,9 @@ class NODE_MT_node(bpy.types.Menu): # XXX # layout.itemO("node.rename") - + layout.itemS() - + layout.itemO("node.show_cyclic_dependencies") bpy.types.register(NODE_HT_header) diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index 892ceed3b04..c1fb82dd321 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -23,7 +23,7 @@ import bpy def act_strip(context): try: return context.scene.sequence_editor.active_strip - except: + except AttributeError: return None @@ -518,7 +518,7 @@ class SEQUENCER_PT_sound(SequencerButtonsPanel): row.itemO("sound.pack", icon='ICON_UGLYPACKAGE', text="Pack") row.itemR(strip.sound, "caching") - + layout.itemR(strip, "volume") diff --git a/release/scripts/ui/space_userpref.py b/release/scripts/ui/space_userpref.py index 28eb8dc06c0..54e03681dc1 100644 --- a/release/scripts/ui/space_userpref.py +++ b/release/scripts/ui/space_userpref.py @@ -1197,7 +1197,7 @@ class USERPREF_PT_input(bpy.types.Panel): itemcol = itemrow.column() itemcol.active = kmi.active row = itemcol.row() - + if km.modal: row.itemR(kmi, "propvalue", text="") else: diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 3b7c43f1ee8..f51b016abc1 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -1334,25 +1334,27 @@ class VIEW3D_MT_edit_armature(bpy.types.Menu): layout.item_menu_enumO("armature.flags_set", "mode", text="Bone Settings") + class VIEW3D_MT_armature_specials(bpy.types.Menu): bl_label = "Specials" def draw(self, context): layout = self.layout - + layout.operator_context = 'INVOKE_REGION_WIN' - + layout.itemO("armature.subdivide_multi", text="Subdivide") layout.itemO("armature.switch_direction", text="Switch Direction") - + layout.itemS() - + layout.operator_context = 'EXEC_REGION_WIN' layout.item_enumO("armature.autoside_names", "type", 'XAXIS', text="AutoName Left/Right") layout.item_enumO("armature.autoside_names", "type", 'YAXIS', text="AutoName Front/Back") layout.item_enumO("armature.autoside_names", "type", 'ZAXIS', text="AutoName Top/Bottom") layout.itemO("armature.flip_names", text="Flip Names") + class VIEW3D_MT_edit_armature_parent(bpy.types.Menu): bl_label = "Parent" @@ -1417,7 +1419,7 @@ class VIEW3D_PT_3dview_name(bpy.types.Panel): bl_space_type = 'VIEW_3D' bl_region_type = 'UI' bl_label = "Item" - + def poll(self, context): return (context.space_data and context.active_object) diff --git a/release/scripts/ui/space_view3d_toolbar.py b/release/scripts/ui/space_view3d_toolbar.py index aaa522008ad..cee0e804c7d 100644 --- a/release/scripts/ui/space_view3d_toolbar.py +++ b/release/scripts/ui/space_view3d_toolbar.py @@ -72,9 +72,6 @@ class VIEW3D_PT_tools_objectmode(View3DPanel): row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line") row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase") - - - # ********** default tools for editmode_mesh **************** @@ -91,14 +88,14 @@ class VIEW3D_PT_tools_meshedit(View3DPanel): col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") col.itemO("tfm.shrink_fatten", text="Along Normal") - + col = layout.column(align=True) col.itemL(text="Deform:") col.itemO("tfm.edge_slide") col.itemO("mesh.rip_move") col.itemO("mesh.vertices_smooth") - + col = layout.column(align=True) col.itemL(text="Add:") @@ -108,13 +105,13 @@ class VIEW3D_PT_tools_meshedit(View3DPanel): col.itemO("mesh.duplicate_move") col.itemO("mesh.spin") col.itemO("mesh.screw") - + col = layout.column(align=True) col.itemL(text="Remove:") col.itemO("mesh.delete") col.itemO("mesh.merge") col.itemO("mesh.remove_doubles") - + col = layout.column(align=True) col.itemL(text="Normals:") col.itemO("mesh.normals_make_consistent", text="Recalculate") @@ -125,13 +122,13 @@ class VIEW3D_PT_tools_meshedit(View3DPanel): col.item_stringO("wm.call_menu", "name", "VIEW3D_MT_uv_map", text="Unwrap") col.itemO("mesh.mark_seam") col.item_booleanO("mesh.mark_seam", "clear", True, text="Clear Seam") - - + + col = layout.column(align=True) col.itemL(text="Shading:") col.itemO("mesh.faces_shade_smooth", text="Smooth") col.itemO("mesh.faces_shade_flat", text="Flat") - + col = layout.column(align=True) col.itemL(text="Repeat:") col.itemO("screen.repeat_last") @@ -194,7 +191,7 @@ class VIEW3D_PT_tools_curveedit(View3DPanel): col.itemL(text="Modeling:") col.itemO("curve.extrude") col.itemO("curve.subdivide") - + col = layout.column(align=True) col.itemL(text="Repeat:") col.itemO("screen.repeat_last") @@ -207,9 +204,6 @@ class VIEW3D_PT_tools_curveedit(View3DPanel): row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line") row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase") - - - # ********** default tools for editmode_surface **************** @@ -237,7 +231,7 @@ class VIEW3D_PT_tools_surfaceedit(View3DPanel): col.itemL(text="Modeling:") col.itemO("curve.extrude") col.itemO("curve.subdivide") - + col = layout.column(align=True) col.itemL(text="Repeat:") col.itemO("screen.repeat_last") @@ -250,9 +244,6 @@ class VIEW3D_PT_tools_surfaceedit(View3DPanel): row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line") row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase") - - - # ********** default tools for editmode_text **************** @@ -268,18 +259,18 @@ class VIEW3D_PT_tools_textedit(View3DPanel): col.itemO("font.text_copy", text="Copy") col.itemO("font.text_cut", text="Cut") col.itemO("font.text_paste", text="Paste") - + col = layout.column(align=True) col.itemL(text="Set Case:") col.item_enumO("font.case_set", "case", 'UPPER', text="To Upper") col.item_enumO("font.case_set", "case", 'LOWER', text="To Lower") - + col = layout.column(align=True) col.itemL(text="Style:") col.item_enumO("font.style_toggle", "style", 'BOLD') col.item_enumO("font.style_toggle", "style", 'ITALIC') col.item_enumO("font.style_toggle", "style", 'UNDERLINE') - + col = layout.column(align=True) col.itemL(text="Repeat:") col.itemO("screen.repeat_last") @@ -325,9 +316,6 @@ class VIEW3D_PT_tools_armatureedit(View3DPanel): row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line") row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase") - - - class VIEW3D_PT_tools_armatureedit_options(View3DPanel): bl_context = "armature_edit" @@ -356,7 +344,7 @@ class VIEW3D_PT_tools_mballedit(View3DPanel): col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - + col = layout.column(align=True) col.itemL(text="Repeat:") col.itemO("screen.repeat_last") @@ -369,9 +357,6 @@ class VIEW3D_PT_tools_mballedit(View3DPanel): row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line") row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase") - - - # ********** default tools for editmode_lattice **************** @@ -387,15 +372,15 @@ class VIEW3D_PT_tools_latticeedit(View3DPanel): col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - + col = layout.column(align=True) col.itemO("lattice.make_regular") - + col = layout.column(align=True) col.itemL(text="Repeat:") col.itemO("screen.repeat_last") col.itemO("screen.repeat_history", text="History...") - + col = layout.column(align=True) col.itemL(text="Grease Pencil:") row = col.row() @@ -419,26 +404,26 @@ class VIEW3D_PT_tools_posemode(View3DPanel): col.itemO("tfm.translate") col.itemO("tfm.rotate") col.itemO("tfm.resize", text="Scale") - + col = layout.column(align=True) col.itemL(text="In-Between:") row = col.row() row.itemO("pose.push", text="Push") row.itemO("pose.relax", text="Relax") col.itemO("pose.breakdown", text="Breakdowner") - + col = layout.column(align=True) col.itemL(text="Pose:") row = col.row() row.itemO("pose.copy", text="Copy") row.itemO("pose.paste", text="Paste") - + col = layout.column(align=True) col.itemO("poselib.pose_add", text="Add To Library") col = layout.column(align=True) col.itemL(text="Keyframes:") - + col.itemO("anim.insert_keyframe_menu", text="Insert") col.itemO("anim.delete_keyframe_v3d", text="Remove") @@ -446,7 +431,7 @@ class VIEW3D_PT_tools_posemode(View3DPanel): col.itemL(text="Repeat:") col.itemO("screen.repeat_last") col.itemO("screen.repeat_history", text="History...") - + col = layout.column(align=True) col.itemL(text="Grease Pencil:") row = col.row() @@ -454,6 +439,7 @@ class VIEW3D_PT_tools_posemode(View3DPanel): row.item_enumO("gpencil.draw", "mode", 'DRAW_STRAIGHT', text="Line") row.item_enumO("gpencil.draw", "mode", 'ERASER', text="Erase") + class VIEW3D_PT_tools_posemode_options(View3DPanel): bl_context = "posemode" bl_label = "Pose Options"