diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-01-27 09:46:07 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-01-28 08:50:51 +0300 |
commit | e17c6f79a57513eb1584fa79f698a8f3a85e0d9a (patch) | |
tree | c2d2483ddbdb816760dcf7f2b4a3d52a64abc6b2 /release/scripts/startup/bl_ui | |
parent | 3e590923485dd0206545654d58202fb073a4469d (diff) |
cleanup: py imports
Diffstat (limited to 'release/scripts/startup/bl_ui')
14 files changed, 74 insertions, 56 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 6a8f9c586ed..9453e9a4690 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -278,9 +278,10 @@ class DATA_PT_iksolver_itasc(ArmatureButtonsPanel, Panel): row.prop(itasc, "damping_max", text="Damp", slider=True) row.prop(itasc, "damping_epsilon", text="Eps", slider=True) -from bl_ui.properties_animviz import (MotionPathButtonsPanel, - OnionSkinButtonsPanel, - ) +from bl_ui.properties_animviz import ( + MotionPathButtonsPanel, + OnionSkinButtonsPanel, + ) class DATA_PT_motion_paths(MotionPathButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py index 9c94c9cf7d5..13a9b88f169 100644 --- a/release/scripts/startup/bl_ui/properties_data_camera.py +++ b/release/scripts/startup/bl_ui/properties_data_camera.py @@ -230,9 +230,10 @@ class DATA_PT_camera_safe_areas(CameraButtonsPanel, Panel): def draw(self, context): layout = self.layout - cam = context.camera + safe_data = context.scene.safe_areas + camera = context.camera - draw_display_safe_settings(layout, cam) + draw_display_safe_settings(layout, safe_data, camera) class DATA_PT_custom_props_camera(CameraButtonsPanel, PropertyPanel, Panel): @@ -241,9 +242,7 @@ class DATA_PT_custom_props_camera(CameraButtonsPanel, PropertyPanel, Panel): _property_type = bpy.types.Camera -def draw_display_safe_settings(layout, settings): - - safe_data = bpy.context.scene.safe_areas +def draw_display_safe_settings(layout, safe_data, settings): show_safe_areas = settings.show_safe_areas show_safe_center = settings.show_safe_center diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 25367a58a54..b822b65bc51 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -323,8 +323,10 @@ class OBJECT_PT_relations_extras(ObjectButtonsPanel, Panel): layout.prop(ob, "use_extra_recalc_data") -from bl_ui.properties_animviz import (MotionPathButtonsPanel, - OnionSkinButtonsPanel) +from bl_ui.properties_animviz import ( + MotionPathButtonsPanel, + OnionSkinButtonsPanel, + ) class OBJECT_PT_motion_paths(MotionPathButtonsPanel, Panel): diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index 1176245da83..681898d1659 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -22,11 +22,12 @@ from bpy.types import Panel, Menu from rna_prop_ui import PropertyPanel from bpy.app.translations import pgettext_iface as iface_ -from bl_ui.properties_physics_common import (point_cache_ui, - effector_weights_ui, - basic_force_field_settings_ui, - basic_force_field_falloff_ui, - ) +from bl_ui.properties_physics_common import ( + point_cache_ui, + effector_weights_ui, + basic_force_field_settings_ui, + basic_force_field_falloff_ui, + ) def particle_panel_enabled(context, psys): diff --git a/release/scripts/startup/bl_ui/properties_physics_cloth.py b/release/scripts/startup/bl_ui/properties_physics_cloth.py index 327ee4035ef..45dd1bf5130 100644 --- a/release/scripts/startup/bl_ui/properties_physics_cloth.py +++ b/release/scripts/startup/bl_ui/properties_physics_cloth.py @@ -20,8 +20,10 @@ import bpy from bpy.types import Menu, Panel -from bl_ui.properties_physics_common import (point_cache_ui, - effector_weights_ui) +from bl_ui.properties_physics_common import ( + point_cache_ui, + effector_weights_ui, + ) def cloth_panel_enabled(md): diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index 6a6d8dcff4a..f8cca01380a 100644 --- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -20,9 +20,10 @@ import bpy from bpy.types import Panel, UIList -from bl_ui.properties_physics_common import (point_cache_ui, - effector_weights_ui, - ) +from bl_ui.properties_physics_common import ( + point_cache_ui, + effector_weights_ui, + ) class PHYSICS_UL_dynapaint_surfaces(UIList): diff --git a/release/scripts/startup/bl_ui/properties_physics_field.py b/release/scripts/startup/bl_ui/properties_physics_field.py index 933a9aa12a3..4a5c16a5a55 100644 --- a/release/scripts/startup/bl_ui/properties_physics_field.py +++ b/release/scripts/startup/bl_ui/properties_physics_field.py @@ -20,9 +20,10 @@ import bpy from bpy.types import Panel -from bl_ui.properties_physics_common import (basic_force_field_settings_ui, - basic_force_field_falloff_ui, - ) +from bl_ui.properties_physics_common import ( + basic_force_field_settings_ui, + basic_force_field_falloff_ui, + ) class PhysicButtonsPanel(): diff --git a/release/scripts/startup/bl_ui/properties_physics_smoke.py b/release/scripts/startup/bl_ui/properties_physics_smoke.py index 5bdbbd70ee6..426bf858bdb 100644 --- a/release/scripts/startup/bl_ui/properties_physics_smoke.py +++ b/release/scripts/startup/bl_ui/properties_physics_smoke.py @@ -20,8 +20,10 @@ import bpy from bpy.types import Panel -from bl_ui.properties_physics_common import (point_cache_ui, - effector_weights_ui) +from bl_ui.properties_physics_common import ( + point_cache_ui, + effector_weights_ui, + ) class PhysicButtonsPanel(): diff --git a/release/scripts/startup/bl_ui/properties_physics_softbody.py b/release/scripts/startup/bl_ui/properties_physics_softbody.py index 17366f59016..f96ab3f8cb1 100644 --- a/release/scripts/startup/bl_ui/properties_physics_softbody.py +++ b/release/scripts/startup/bl_ui/properties_physics_softbody.py @@ -20,8 +20,10 @@ import bpy from bpy.types import Panel -from bl_ui.properties_physics_common import (point_cache_ui, - effector_weights_ui) +from bl_ui.properties_physics_common import ( + point_cache_ui, + effector_weights_ui, + ) def softbody_panel_enabled(md): diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 5e4c9314479..b3635acd392 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -22,9 +22,9 @@ from bpy.types import Panel, UIList from rna_prop_ui import PropertyPanel from bl_ui.properties_physics_common import ( - point_cache_ui, - effector_weights_ui, - ) + point_cache_ui, + effector_weights_ui, + ) class SCENE_UL_keying_set_paths(UIList): diff --git a/release/scripts/startup/bl_ui/properties_texture.py b/release/scripts/startup/bl_ui/properties_texture.py index 22e3152e50a..a0c4e0c92c3 100644 --- a/release/scripts/startup/bl_ui/properties_texture.py +++ b/release/scripts/startup/bl_ui/properties_texture.py @@ -20,14 +20,16 @@ import bpy from bpy.types import Menu, Panel, UIList -from bpy.types import (Brush, - Lamp, - Material, - Object, - ParticleSettings, - FreestyleLineStyle, - Texture, - World) +from bpy.types import ( + Brush, + FreestyleLineStyle, + Lamp, + Material, + Object, + ParticleSettings, + Texture, + World, + ) from rna_prop_ui import PropertyPanel diff --git a/release/scripts/startup/bl_ui/space_clip.py b/release/scripts/startup/bl_ui/space_clip.py index d2f2612c84e..e7c95bf1155 100644 --- a/release/scripts/startup/bl_ui/space_clip.py +++ b/release/scripts/startup/bl_ui/space_clip.py @@ -1003,15 +1003,16 @@ class CLIP_PT_proxy(CLIP_PT_clip_view_panel, Panel): # ----------------------------------------------------------------------------- # Mask (similar code in space_image.py, keep in sync) - -from bl_ui.properties_mask_common import (MASK_PT_mask, - MASK_PT_layers, - MASK_PT_spline, - MASK_PT_point, - MASK_PT_display, - MASK_PT_tools, - MASK_PT_transforms, - MASK_PT_add) +from bl_ui.properties_mask_common import ( + MASK_PT_mask, + MASK_PT_layers, + MASK_PT_spline, + MASK_PT_point, + MASK_PT_display, + MASK_PT_tools, + MASK_PT_transforms, + MASK_PT_add, + ) class CLIP_PT_mask_layers(MASK_PT_layers, Panel): diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index a302dab28c3..f1dd594aaf9 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -28,7 +28,7 @@ from bl_ui.properties_paint_common import ( from bl_ui.properties_grease_pencil_common import ( GreasePencilDrawingToolsPanel, GreasePencilStrokeEditPanel, - GreasePencilDataPanel + GreasePencilDataPanel, ) from bpy.app.translations import pgettext_iface as iface_ @@ -515,12 +515,14 @@ class MASK_MT_editor_menus(Menu): # Mask (similar code in space_clip.py, keep in sync) # note! - panel placement does _not_ fit well with image panels... need to fix -from bl_ui.properties_mask_common import (MASK_PT_mask, - MASK_PT_layers, - MASK_PT_spline, - MASK_PT_point, - MASK_PT_display, - MASK_PT_tools) +from bl_ui.properties_mask_common import ( + MASK_PT_mask, + MASK_PT_layers, + MASK_PT_spline, + MASK_PT_point, + MASK_PT_display, + MASK_PT_tools, + ) class IMAGE_PT_mask(MASK_PT_mask, Panel): diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index bf63b847996..76c579f221f 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -22,7 +22,6 @@ from bpy.types import Header, Menu, Panel from bl_ui.properties_grease_pencil_common import GreasePencilDataPanel, GreasePencilToolsPanel from bpy.app.translations import pgettext_iface as iface_ -from bl_ui.properties_data_camera import draw_display_safe_settings def act_strip(context): try: @@ -1000,10 +999,13 @@ class SEQUENCER_PT_view_safe_areas(SequencerButtonsPanel_Output, Panel): self.layout.prop(st, "show_safe_areas", text="") def draw(self, context): + from bl_ui.properties_data_camera import draw_display_safe_settings + layout = self.layout st = context.space_data + safe_data = context.scene.safe_areas - draw_display_safe_settings(layout, st) + draw_display_safe_settings(layout, safe_data, st) class SEQUENCER_PT_modifiers(SequencerButtonsPanel, Panel): |