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/startup/bl_operators/object_quick_effects.py
+++ b/release/scripts/startup/bl_operators/object_quick_effects.py
@@ -24,9 +24,9 @@ from bpy.types import Operator
 from bpy.props import (
    BoolProperty,
    EnumProperty,
-    IntProperty,
    FloatProperty,
    FloatVectorProperty,
+    IntProperty,
 )