Merge branch 'master' into blender2.8

2017-03-25 13:49:13 +11:00
parent edd2c556cd 7cb2974182
commit f730e386eb
28 changed files with 1247 additions and 150 deletions
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -21,12 +21,12 @@
 import bpy
 from bpy.types import Operator
 from bpy.props import (
-        StringProperty,
-        BoolProperty,
-        EnumProperty,
-        IntProperty,
-        FloatProperty,
-        )
+    BoolProperty,
+    EnumProperty,
+    FloatProperty,
+    IntProperty,
+    StringProperty,
+)


 class SelectPattern(Operator):
@@ -1054,4 +1054,4 @@ classes = (
    SubdivisionSet,
    TransformsToDeltas,
    TransformsToDeltasAnim,
-)
+)