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/rigidbody.py
+++ b/release/scripts/startup/bl_operators/rigidbody.py
@@ -20,8 +20,10 @@

 import bpy
 from bpy.types import Operator
-from bpy.props import IntProperty
-from bpy.props import EnumProperty
+from bpy.props import (
+    EnumProperty,
+    IntProperty,
+)


 class CopyRigidbodySettings(Operator):
@@ -315,4 +317,4 @@ classes = (
    BakeToKeyframes,
    ConnectRigidBodies,
    CopyRigidbodySettings,
-)
+)