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/freestyle.py
+++ b/release/scripts/startup/bl_operators/freestyle.py
@@ -16,13 +16,15 @@
 #
 # ##### END GPL LICENSE BLOCK #####

+# <pep8 compliant>
+
 import bpy

 from bpy.props import (
-        BoolProperty,
-        EnumProperty,
-        StringProperty,
-        )
+    BoolProperty,
+    EnumProperty,
+    StringProperty,
+)


 class SCENE_OT_freestyle_fill_range_by_selection(bpy.types.Operator):