diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-11-29 10:06:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-11-29 10:06:24 +0300 |
commit | 3cb19a3d895bfe6c7bd6d5068bdc00cd94e4fb13 (patch) | |
tree | 4a11b07c6b0f27309de23e7e66070c170282f8f9 /release/scripts/modules/bpy_extras | |
parent | 639d49b01fdab537ed4782adcb4da260a9c2a854 (diff) | |
parent | ad7fb1c028433621a9f71ab01bbda2ca827ffe74 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/modules/bpy_extras')
-rw-r--r-- | release/scripts/modules/bpy_extras/io_utils.py | 8 | ||||
-rw-r--r-- | release/scripts/modules/bpy_extras/object_utils.py | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/release/scripts/modules/bpy_extras/io_utils.py b/release/scripts/modules/bpy_extras/io_utils.py index a7ecd0b80c0..8a516f12b17 100644 --- a/release/scripts/modules/bpy_extras/io_utils.py +++ b/release/scripts/modules/bpy_extras/io_utils.py @@ -36,10 +36,10 @@ __all__ = ( import bpy from bpy.props import ( - StringProperty, - BoolProperty, - EnumProperty, - ) + BoolProperty, + EnumProperty, + StringProperty, +) def _check_axis_conversion(op): diff --git a/release/scripts/modules/bpy_extras/object_utils.py b/release/scripts/modules/bpy_extras/object_utils.py index eb0123f12eb..04b3858bb0d 100644 --- a/release/scripts/modules/bpy_extras/object_utils.py +++ b/release/scripts/modules/bpy_extras/object_utils.py @@ -32,10 +32,10 @@ __all__ = ( import bpy from bpy.props import ( - BoolProperty, - BoolVectorProperty, - FloatVectorProperty, - ) + BoolProperty, + BoolVectorProperty, + FloatVectorProperty, +) def add_object_align_init(context, operator): |