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/templates_py/operator_mesh_add.py
+++ b/release/scripts/templates_py/operator_mesh_add.py
@@ -34,11 +34,11 @@ def add_box(width, height, depth):


 from bpy.props import (
-        BoolProperty,
-        BoolVectorProperty,
-        FloatProperty,
-        FloatVectorProperty,
-        )
+    BoolProperty,
+    BoolVectorProperty,
+    FloatProperty,
+    FloatVectorProperty,
+)


 class AddBox(bpy.types.Operator):