Merge branch 'master' into blender2.8

2017-11-29 18:06:24 +11:00
parent 639d49b01f ad7fb1c028
commit 3cb19a3d89
14 changed files with 66 additions and 46 deletions
--- 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):