[Bf-extensions-cvs] [309fd2c] master: Cleanup: import, dead code
Campbell Barton
noreply at git.blender.org
Wed Jul 27 03:08:29 CEST 2016
Commit: 309fd2c56cbe02976bc52e65206ba208b9a42c33
Author: Campbell Barton
Date: Wed Jul 27 09:28:26 2016 +1000
Branches: master
https://developer.blender.org/rBAC309fd2c56cbe02976bc52e65206ba208b9a42c33
Cleanup: import, dead code
===================================================================
M space_view3d_pie_menus/__init__.py
M space_view3d_pie_menus/pie_align_menu/__init__.py
M space_view3d_pie_menus/pie_animation_menu/__init__.py
M space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
M space_view3d_pie_menus/pie_delete_menu/__init__.py
M space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
M space_view3d_pie_menus/pie_manipulator_menu/__init__.py
M space_view3d_pie_menus/pie_modes_menu/__init__.py
M space_view3d_pie_menus/pie_orientation_menu/__init__.py
M space_view3d_pie_menus/pie_origin_cursor/__init__.py
M space_view3d_pie_menus/pie_proportional_menu/__init__.py
M space_view3d_pie_menus/pie_save_open_menu/__init__.py
M space_view3d_pie_menus/pie_sculpt_menu/__init__.py
M space_view3d_pie_menus/pie_select_menu/__init__.py
M space_view3d_pie_menus/pie_snap_menu/__init__.py
M space_view3d_pie_menus/pie_views_numpad_menu/__init__.py
M space_view3d_pie_menus/utils.py
===================================================================
diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py
index 79c6e94..b6f7eaf 100644
--- a/space_view3d_pie_menus/__init__.py
+++ b/space_view3d_pie_menus/__init__.py
@@ -82,9 +82,9 @@ def get_addon_preferences(name=''):
addons = bpy.context.user_preferences.addons
if __name__ not in addons: # wm.read_factory_settings()
return None
- prefs = addons[__name__].preferences
+ addon_prefs = addons[__name__].preferences
if name:
- if not hasattr(prefs, name):
+ if not hasattr(addon_prefs, name):
for mod in sub_modules:
if mod.__name__.split('.')[-1] == name:
cls = _get_pref_class(mod)
@@ -93,9 +93,9 @@ def get_addon_preferences(name=''):
setattr(UIToolsPreferences, name, prop)
bpy.utils.unregister_class(UIToolsPreferences)
bpy.utils.register_class(UIToolsPreferences)
- return getattr(prefs, name, None)
+ return getattr(addon_prefs, name, None)
else:
- return prefs
+ return addon_prefs
def register_submodule(mod):
diff --git a/space_view3d_pie_menus/pie_align_menu/__init__.py b/space_view3d_pie_menus/pie_align_menu/__init__.py
index a20665e..481b7dc 100644
--- a/space_view3d_pie_menus/pie_align_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_align_menu/__init__.py
@@ -31,7 +31,10 @@ bl_info = {
}
import bpy
-from bpy.types import Menu
+from bpy.types import (
+ Menu,
+ Operator,
+ )
# Pie Align - Alt + X
@@ -82,7 +85,7 @@ class PieAlign(Menu):
# Align X
-class AlignX(bpy.types.Operator):
+class AlignX(Operator):
bl_idname = "align.x"
bl_label = "Align X"
bl_description = "Align Selected Along X"
@@ -98,7 +101,7 @@ class AlignX(bpy.types.Operator):
# Align Y
-class AlignY(bpy.types.Operator):
+class AlignY(Operator):
bl_idname = "align.y"
bl_label = "Align Y"
bl_description = "Align Selected Along Y"
@@ -114,7 +117,7 @@ class AlignY(bpy.types.Operator):
# Align Z
-class AlignZ(bpy.types.Operator):
+class AlignZ(Operator):
bl_idname = "align.z"
bl_label = "Align Z"
bl_description = "Align Selected Along Z"
@@ -134,7 +137,7 @@ class AlignZ(bpy.types.Operator):
# Align to X - 0
-class AlignToX0(bpy.types.Operator):
+class AlignToX0(Operator):
bl_idname = "align.2x0"
bl_label = "Align To X = 0"
bl_description = "Align Selected To Location X = 0"
@@ -152,7 +155,7 @@ class AlignToX0(bpy.types.Operator):
# Align to Z - 0
-class AlignToY0(bpy.types.Operator):
+class AlignToY0(Operator):
bl_idname = "align.2y0"
bl_label = "Align To Y = 0"
bl_description = "Align Selected To Location Y = 0"
@@ -170,7 +173,7 @@ class AlignToY0(bpy.types.Operator):
# Align to Z - 0
-class AlignToZ0(bpy.types.Operator):
+class AlignToZ0(Operator):
bl_idname = "align.2z0"
bl_label = "Align To Z = 0"
bl_description = "Align Selected To Location Z = 0"
@@ -188,7 +191,7 @@ class AlignToZ0(bpy.types.Operator):
# Align X Left
-class AlignXLeft(bpy.types.Operator):
+class AlignXLeft(Operator):
bl_idname = "alignx.left"
bl_label = "Align X Left"
bl_options = {'REGISTER', 'UNDO'}
@@ -219,7 +222,7 @@ class AlignXLeft(bpy.types.Operator):
# Align X Right
-class AlignXRight(bpy.types.Operator):
+class AlignXRight(Operator):
bl_idname = "alignx.right"
bl_label = "Align X Right"
@@ -249,7 +252,7 @@ class AlignXRight(bpy.types.Operator):
# Align Y Back
-class AlignYBack(bpy.types.Operator):
+class AlignYBack(Operator):
bl_idname = "aligny.back"
bl_label = "Align Y back"
bl_options = {'REGISTER', 'UNDO'}
@@ -280,7 +283,7 @@ class AlignYBack(bpy.types.Operator):
# Align Y Front
-class AlignYFront(bpy.types.Operator):
+class AlignYFront(Operator):
bl_idname = "aligny.front"
bl_label = "Align Y Front"
bl_options = {'REGISTER', 'UNDO'}
@@ -311,7 +314,7 @@ class AlignYFront(bpy.types.Operator):
# Align Z Top
-class AlignZTop(bpy.types.Operator):
+class AlignZTop(Operator):
bl_idname = "alignz.top"
bl_label = "Align Z Top"
bl_options = {'REGISTER', 'UNDO'}
@@ -342,7 +345,7 @@ class AlignZTop(bpy.types.Operator):
# Align Z Bottom
-class AlignZBottom(bpy.types.Operator):
+class AlignZBottom(Operator):
bl_idname = "alignz.bottom"
bl_label = "Align Z Bottom"
bl_options = {'REGISTER', 'UNDO'}
diff --git a/space_view3d_pie_menus/pie_animation_menu/__init__.py b/space_view3d_pie_menus/pie_animation_menu/__init__.py
index 6f74461..9c2b604 100644
--- a/space_view3d_pie_menus/pie_animation_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_animation_menu/__init__.py
@@ -31,7 +31,10 @@ bl_info = {
}
import bpy
-from bpy.types import Menu
+from bpy.types import (
+ Menu,
+ Operator,
+ )
# Pie Animation
@@ -65,22 +68,18 @@ class PieAnimation(Menu):
# Insert Auto Keyframe
-class InsertAutoKeyframe(bpy.types.Operator):
+class InsertAutoKeyframe(Operator):
bl_idname = "insert.autokeyframe"
bl_label = "Insert Auto Keyframe"
bl_description = "Toggle Insert Auto Keyframe"
bl_options = {'REGISTER', 'UNDO'}
def execute(self, context):
+ ts = context.tool_settings
- if bpy.context.scene.tool_settings.use_keyframe_insert_auto == True:
- bpy.context.scene.tool_settings.use_keyframe_insert_auto = False
+ ts.use_keyframe_insert_auto ^= 1
- else:
- if bpy.context.scene.tool_settings.use_keyframe_insert_auto == False:
- bpy.context.scene.tool_settings.use_keyframe_insert_auto = True
-
- for area in bpy.context.screen.areas:
+ for area in context.screen.areas:
if area.type in ('TIMELINE'):
area.tag_redraw()
diff --git a/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py b/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
index f87795c..a3f9e51 100644
--- a/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_apply_transform_menu/__init__.py
@@ -31,7 +31,10 @@ bl_info = {
}
import bpy
-from bpy.types import Menu
+from bpy.types import (
+ Menu,
+ Operator,
+ )
# Pie Apply Transforms - Ctrl + A
@@ -63,7 +66,7 @@ class PieApplyTransforms(Menu):
# Apply Transforms
-class ApplyTransformLocation(bpy.types.Operator):
+class ApplyTransformLocation(Operator):
bl_idname = "apply.transformlocation"
bl_label = "Apply Transform Location"
bl_description = "Apply Transform Location"
@@ -76,7 +79,7 @@ class ApplyTransformLocation(bpy.types.Operator):
# Apply Transforms
-class ApplyTransformRotation(bpy.types.Operator):
+class ApplyTransformRotation(Operator):
bl_idname = "apply.transformrotation"
bl_label = "Apply Transform Rotation"
bl_description = "Apply Transform Rotation"
@@ -89,7 +92,7 @@ class ApplyTransformRotation(bpy.types.Operator):
# Apply Transforms
-class ApplyTransformScale(bpy.types.Operator):
+class ApplyTransformScale(Operator):
bl_idname = "apply.transformscale"
bl_label = "Apply Transform Scale"
bl_description = "Apply Transform Scale"
@@ -102,7 +105,7 @@ class ApplyTransformScale(bpy.types.Operator):
# Apply Transforms
-class ApplyTransformRotationScale(bpy.types.Operator):
+class ApplyTransformRotationScale(Operator):
bl_idname = "apply.transformrotationscale"
bl_label = "Apply Transform Rotation Scale"
bl_description = "Apply Transform Rotation Scale"
@@ -115,7 +118,7 @@ class ApplyTransformRotationScale(bpy.types.Operator):
# Apply Transforms
-class ApplyTransformAll(bpy.types.Operator):
+class ApplyTransformAll(Operator):
bl_idname = "apply.transformall"
bl_label = "Apply All Transforms"
bl_description = "Apply Transform All"
@@ -128,7 +131,7 @@ class ApplyTransformAll(bpy.types.Operator):
# More Menu
-class TransformApplyMore(bpy.types.Menu):
+class TransformApplyMore(Menu):
bl_idname = "applymore.menu"
bl_label = "More Menu"
@@ -140,7 +143,7 @@ class TransformApplyMore(bpy.types.Menu):
# Clear Menu
-class ClearMenu(bpy.types.Menu):
+class ClearMenu(Menu):
bl_idname = "clear.menu"
bl_label = "Clear Menu"
@@ -154,7 +157,7 @@ class ClearMenu(bpy.types.Menu):
# Clear all
-class ClearAll(bpy.types.Operator):
+class ClearAll(Operator):
bl_idname = "clear.all"
bl_label = "Clear All"
bl_description = "Clear All Transforms"
diff --git a/space_view3d_pie_menus/pie_delete_menu/__init__.py b/space_view3d_pie_menus/pie_delete_menu/__init__.py
index 9e02c13..3053dfd 100644
--- a/space_view3d_pie_menus/pie_delete_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_delete_menu/__init__.py
@@ -31,7 +31,10 @@ bl_info = {
}
import bpy
-from bpy.types import Menu
+from bpy.types import (
+ Menu,
+ Operator,
+ )
# Pie Delete - X
@@ -71,7 +74,7 @@ class PieDelete(Menu):
# Limited Dissolve
-class DeleteLimitedDissolve(bpy.types.Operator):
+class DeleteLimitedDissolve(Operator):
bl_idname = "delete.limiteddissolve"
bl_label = "Delete Limited Dissolve"
bl_options = {'REGISTER', 'UNDO'}
diff --git a/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py b/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
index da1910c..303c27e 100644
--- a/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
+++ b/space_view3d_pie_menus/pie_editor_switch_menu/__init__.py
@@ -31,13 +31,16 @@ bl_info = {
}
import bpy
-from bpy.types import Menu
+from bpy.types import (
+ Menu,
+ Operator,
+ )
from bpy.props import (
StringProperty,
)
-class AreaPieMenu(bpy.types.Menu):
+class AreaPieMenu(Menu):
bl_idname = "INFO_MT_window_pie"
bl_label = "Pie Menu"
bl_description = "Window Pie Menus"
@@ -46,7 +49,7 @@ class AreaPieMenu(bpy.types.Menu):
self.layout.operator(AreaTypePieOperator.bl_idname, icon="PLUGIN")
-class AreaTypePieOperator(bpy.types.Operator):
+class AreaTypePieOperator(Operator):
bl_id
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list