diff options
Diffstat (limited to 'release/scripts/startup')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_armature.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_speaker.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_game.py | 10 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_mask_common.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 6 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_texture.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_world.py | 14 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_clip.py | 15 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_image.py | 8 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_node.py | 4 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_sequencer.py | 6 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_text.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 8 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 24 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d_toolbar.py | 2 |
15 files changed, 55 insertions, 54 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 29170cde1fa..e194d7a1370 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -323,7 +323,7 @@ class DATA_PT_onion_skinning(OnionSkinButtonsPanel): # , Panel): # inherit from def draw(self, context): ob = context.object - + self.draw_settings(context, ob.pose.animation_visualization, bones=True) diff --git a/release/scripts/startup/bl_ui/properties_data_speaker.py b/release/scripts/startup/bl_ui/properties_data_speaker.py index 1d7646e9280..ca922dfb544 100644 --- a/release/scripts/startup/bl_ui/properties_data_speaker.py +++ b/release/scripts/startup/bl_ui/properties_data_speaker.py @@ -105,7 +105,7 @@ class DATA_PT_cone(DataButtonsPanel, Panel): speaker = context.speaker split = layout.split() - + col = split.column() col.label("Angle:") col.prop(speaker, "cone_angle_outer", text="Outer") diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 54817c27714..5ff49a7d369 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -347,7 +347,7 @@ class RENDER_PT_game_stereo(RenderButtonsPanel, Panel): elif dome_type == 'PANORAM_SPH': col = split.column() col.prop(gs, "dome_buffer_resolution", text="Resolution", slider=True) - + col = split.column() col.prop(gs, "dome_tessellation", text="Tessellation") @@ -394,7 +394,7 @@ class RENDER_PT_game_system(RenderButtonsPanel, Panel): layout = self.layout gs = context.scene.game_settings - + row = layout.row() row.prop(gs, "use_frame_rate") row.prop(gs, "restrict_animation_updates") @@ -413,7 +413,7 @@ class RENDER_PT_game_display(RenderButtonsPanel, Panel): def draw(self, context): layout = self.layout - + gs = context.scene.game_settings layout.prop(context.scene.render, "fps", text="Animation Frame Rate", slider=False) @@ -581,13 +581,13 @@ class WORLD_PT_game_mist(WorldButtonsPanel, Panel): world = context.world layout.active = world.mist_settings.use_mist - + layout.prop(world.mist_settings, "falloff") row = layout.row(align=True) row.prop(world.mist_settings, "start") row.prop(world.mist_settings, "depth") - + layout.prop(world.mist_settings, "intensity", text="Minimum Intensity") diff --git a/release/scripts/startup/bl_ui/properties_mask_common.py b/release/scripts/startup/bl_ui/properties_mask_common.py index 699ade3cb95..e40b46fda70 100644 --- a/release/scripts/startup/bl_ui/properties_mask_common.py +++ b/release/scripts/startup/bl_ui/properties_mask_common.py @@ -16,7 +16,7 @@ # # ##### END GPL LICENSE BLOCK ##### -# <pep8 compliant> +# <pep8-80 compliant> # panels get subclassed (not registered directly) # menus are referenced `as is` @@ -122,7 +122,7 @@ class MASK_PT_spline(): col = layout.column() col.prop(spline, "weight_interpolation") - + row = col.row() row.prop(spline, "use_cyclic") row.prop(spline, "use_fill") diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 361332428b6..8449d26f6e6 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -39,7 +39,7 @@ class SCENE_PT_scene(SceneButtonsPanel, Panel): def draw(self, context): layout = self.layout - + scene = context.scene layout.prop(scene, "camera") @@ -53,7 +53,7 @@ class SCENE_PT_audio(SceneButtonsPanel, Panel): def draw(self, context): layout = self.layout - + scene = context.scene rd = context.scene.render ffmpeg = rd.ffmpeg @@ -83,7 +83,7 @@ class SCENE_PT_unit(SceneButtonsPanel, Panel): def draw(self, context): layout = self.layout - + unit = context.scene.unit_settings col = layout.column() diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 96094708ea2..46a17675c91 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -116,7 +116,7 @@ class TEXTURE_PT_context_texture(TextureButtonsPanel, Panel): def draw(self, context): layout = self.layout - + slot = getattr(context, "texture_slot", None) node = getattr(context, "texture_node", None) space = context.space_data diff --git a/release/scripts/startup/bl_ui/properties_world.py b/release/scripts/startup/bl_ui/properties_world.py index 5af87875018..0b8d8a45a08 100644 --- a/release/scripts/startup/bl_ui/properties_world.py +++ b/release/scripts/startup/bl_ui/properties_world.py @@ -82,7 +82,7 @@ class WORLD_PT_world(WorldButtonsPanel, Panel): def draw(self, context): layout = self.layout - + world = context.world row = layout.row() @@ -112,7 +112,7 @@ class WORLD_PT_ambient_occlusion(WorldButtonsPanel, Panel): def draw(self, context): layout = self.layout - + light = context.world.light_settings layout.active = light.use_ambient_occlusion @@ -132,7 +132,7 @@ class WORLD_PT_environment_lighting(WorldButtonsPanel, Panel): def draw(self, context): layout = self.layout - + light = context.world.light_settings layout.active = light.use_environment_light @@ -152,7 +152,7 @@ class WORLD_PT_indirect_lighting(WorldButtonsPanel, Panel): def draw(self, context): layout = self.layout - + light = context.world.light_settings layout.active = light.use_indirect_light and light.gather_method == 'APPROXIMATE' @@ -171,7 +171,7 @@ class WORLD_PT_gather(WorldButtonsPanel, Panel): def draw(self, context): layout = self.layout - + light = context.world.light_settings layout.active = light.use_ambient_occlusion or light.use_environment_light or light.use_indirect_light @@ -226,7 +226,7 @@ class WORLD_PT_mist(WorldButtonsPanel, Panel): def draw(self, context): layout = self.layout - + world = context.world layout.active = world.mist_settings.use_mist @@ -256,7 +256,7 @@ class WORLD_PT_stars(WorldButtonsPanel, Panel): def draw(self, context): layout = self.layout - + world = context.world layout.active = world.star_settings.use_stars diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index 53fcf71c31f..559cf7f93b7 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -188,11 +188,11 @@ class CLIP_PT_tools_marker(CLIP_PT_tracking_panel, Panel): def draw(self, context): layout = self.layout - + sc = context.space_data clip = sc.clip settings = clip.tracking.settings - + col = layout.column(align=True) col.operator("clip.add_marker_move") col.operator("clip.detect_features") @@ -293,7 +293,7 @@ class CLIP_PT_tools_solve(CLIP_PT_tracking_panel, Panel): def draw(self, context): layout = self.layout - + clip = context.space_data.clip tracking = clip.tracking settings = tracking.settings @@ -484,7 +484,7 @@ class CLIP_PT_track(CLIP_PT_tracking_panel, Panel): def draw(self, context): layout = self.layout - + sc = context.space_data clip = context.space_data.clip act_track = clip.tracking.tracks.active @@ -551,7 +551,7 @@ class CLIP_PT_track_settings(CLIP_PT_tracking_panel, Panel): def draw(self, context): layout = self.layout - + clip = context.space_data.clip settings = clip.tracking.settings @@ -786,7 +786,7 @@ class CLIP_PT_proxy(CLIP_PT_clip_view_panel, Panel): def draw(self, context): layout = self.layout - + sc = context.space_data clip = sc.clip @@ -864,7 +864,7 @@ class CLIP_MT_view(Menu): def draw(self, context): layout = self.layout - + sc = context.space_data if sc.view == 'CLIP': @@ -1172,6 +1172,7 @@ class CLIP_PT_active_mask_point(MASK_PT_point, Panel): bl_space_type = 'CLIP_EDITOR' bl_region_type = 'UI' + class CLIP_PT_tools_mask(MASK_PT_tools, Panel): bl_space_type = 'CLIP_EDITOR' bl_region_type = 'TOOLS' diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index 87f7104d74e..3d9b3afc4ee 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -213,7 +213,7 @@ class IMAGE_MT_uvs_snap(Menu): def draw(self, context): layout = self.layout - + layout.operator_context = 'EXEC_REGION_WIN' layout.operator("uv.snap_selected", text="Selected to Pixels").target = 'PIXELS' @@ -231,7 +231,7 @@ class IMAGE_MT_uvs_mirror(Menu): def draw(self, context): layout = self.layout - + layout.operator_context = 'EXEC_REGION_WIN' layout.operator("transform.mirror", text="X Axis").constraint_axis[0] = True @@ -839,7 +839,7 @@ class IMAGE_UV_sculpt(Panel, ImagePaintPanel): row = col.row(align=True) self.prop_unified_strength(row, context, brush, "strength", slider=True, text="Strength") self.prop_unified_strength(row, context, brush, "use_pressure_strength") - + col = layout.column() col.prop(toolsettings, "uv_sculpt_lock_borders") col.prop(toolsettings, "uv_sculpt_all_islands") @@ -849,7 +849,6 @@ class IMAGE_UV_sculpt(Panel, ImagePaintPanel): col.prop(toolsettings, "uv_relax_method") - # ----------------------------------------------------------------------------- # Mask (similar code in space_clip.py, keep in sync) # note! - panel placement does _not_ fit well with image panels... need to fix @@ -886,6 +885,7 @@ class IMAGE_PT_active_mask_point(MASK_PT_point, Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'PREVIEW' + class IMAGE_PT_tools_mask(MASK_PT_tools, Panel): bl_space_type = 'IMAGE_EDITOR' bl_region_type = 'UI' # is 'TOOLS' in the clip editor diff --git a/release/scripts/startup/bl_ui/space_node.py b/release/scripts/startup/bl_ui/space_node.py index 9ff290698d3..961ab08efdd 100644 --- a/release/scripts/startup/bl_ui/space_node.py +++ b/release/scripts/startup/bl_ui/space_node.py @@ -226,7 +226,7 @@ class NODE_PT_quality(bpy.types.Panel): def draw(self, context): layout = self.layout - + snode = context.space_data tree = snode.node_tree @@ -236,7 +236,7 @@ class NODE_PT_quality(bpy.types.Panel): layout.prop(tree, "use_opencl") layout.prop(tree, "two_pass") layout.prop(snode, "show_highlight") - + class NODE_MT_node_color_presets(Menu): """Predefined node color""" diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index fb212f594c8..d099db1645b 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -184,7 +184,7 @@ class SEQUENCER_MT_add(Menu): def draw(self, context): layout = self.layout - + layout.operator_context = 'INVOKE_REGION_WIN' if len(bpy.data.scenes) > 10: @@ -217,7 +217,7 @@ class SEQUENCER_MT_add_effect(Menu): def draw(self, context): layout = self.layout - + layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("sequencer.effect_strip_add", text="Add").type = 'ADD' @@ -836,7 +836,7 @@ class SEQUENCER_PT_preview(SequencerButtonsPanel_Output, Panel): def draw(self, context): layout = self.layout - + render = context.scene.render col = layout.column() diff --git a/release/scripts/startup/bl_ui/space_text.py b/release/scripts/startup/bl_ui/space_text.py index 56b242382df..eca9bc22db9 100644 --- a/release/scripts/startup/bl_ui/space_text.py +++ b/release/scripts/startup/bl_ui/space_text.py @@ -302,7 +302,7 @@ class TEXT_MT_toolbox(Menu): def draw(self, context): layout = self.layout - + layout.operator_context = 'INVOKE_DEFAULT' layout.operator("text.cut") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 5f59a76e724..e443c7804a6 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -79,7 +79,7 @@ class USERPREF_HT_header(Header): def draw(self, context): layout = self.layout - + layout.template_header(menus=False) userpref = context.user_preferences @@ -138,7 +138,7 @@ class USERPREF_MT_splash(Menu): def draw(self, context): layout = self.layout - + split = layout.split() row = split.row() row.label("") @@ -852,7 +852,7 @@ class USERPREF_MT_ndof_settings(Menu): def draw(self, context): layout = self.layout - + input_prefs = context.user_preferences.inputs layout.separator() @@ -982,7 +982,7 @@ class USERPREF_MT_addons_dev_guides(Menu): # menu to open web-pages with addons development guides def draw(self, context): layout = self.layout - + layout.operator("wm.url_open", text="API Concepts", icon='URL').url = "http://wiki.blender.org/index.php/Dev:2.5/Py/API/Intro" layout.operator("wm.url_open", text="Addon Guidelines", icon='URL').url = "http://wiki.blender.org/index.php/Dev:2.5/Py/Scripts/Guidelines/Addons" layout.operator("wm.url_open", text="How to share your addon", icon='URL').url = "http://wiki.blender.org/index.php/Dev:Py/Sharing" diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index aea587844cf..5f6ed15e6e1 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -177,7 +177,7 @@ class VIEW3D_MT_transform(VIEW3D_MT_transform_base): class VIEW3D_MT_transform_object(VIEW3D_MT_transform_base): def draw(self, context): layout = self.layout - + # base menu VIEW3D_MT_transform_base.draw(self, context) @@ -214,7 +214,7 @@ class VIEW3D_MT_transform_object(VIEW3D_MT_transform_base): class VIEW3D_MT_transform_armature(VIEW3D_MT_transform_base): def draw(self, context): layout = self.layout - + # base menu VIEW3D_MT_transform_base.draw(self, context) @@ -431,23 +431,23 @@ class VIEW3D_MT_view_align_selected(Menu): props = layout.operator("view3d.viewnumpad", text="Top") props.align_active = True props.type = 'TOP' - + props = layout.operator("view3d.viewnumpad", text="Bottom") props.align_active = True props.type = 'BOTTOM' - + props = layout.operator("view3d.viewnumpad", text="Front") props.align_active = True props.type = 'FRONT' - + props = layout.operator("view3d.viewnumpad", text="Back") props.align_active = True props.type = 'BACK' - + props = layout.operator("view3d.viewnumpad", text="Right") props.align_active = True props.type = 'RIGHT' - + props = layout.operator("view3d.viewnumpad", text="Left") props.align_active = True props.type = 'LEFT' @@ -1198,7 +1198,7 @@ class VIEW3D_MT_vertex_group(Menu): def draw(self, context): layout = self.layout - + layout.operator_context = 'EXEC_AREA' layout.operator("object.vertex_group_assign", text="Assign to New Group").new = True @@ -1357,7 +1357,7 @@ class VIEW3D_MT_particle_specials(Menu): def draw(self, context): layout = self.layout - + particle_edit = context.tool_settings.particle_edit layout.operator("particle.rekey") @@ -1801,7 +1801,7 @@ class VIEW3D_MT_edit_mesh_edges(Menu): def draw(self, context): layout = self.layout - + layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("mesh.edge_face_add") @@ -1849,7 +1849,7 @@ class VIEW3D_MT_edit_mesh_faces(Menu): def draw(self, context): layout = self.layout - + layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("mesh.flip_normals") @@ -2643,7 +2643,7 @@ class VIEW3D_PT_etch_a_ton(Panel): def draw(self, context): layout = self.layout - + toolsettings = context.scene.tool_settings col = layout.column() diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index a83a6e215fa..ac962ab5097 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1124,7 +1124,7 @@ class VIEW3D_MT_tools_projectpaint_clone(Menu): def draw(self, context): layout = self.layout - + for i, tex in enumerate(context.active_object.data.uv_textures): props = layout.operator("wm.context_set_int", text=tex.name) props.data_path = "active_object.data.uv_texture_clone_index" |