Merge branch 'master' into blender2.8

2018-07-03 06:58:34 +02:00
parent e856eb7e8b 8c15d612a5
commit 00fc1d70a7
56 changed files with 757 additions and 622 deletions
--- a/release/scripts/modules/bpy_extras/object_utils.py
+++ b/release/scripts/modules/bpy_extras/object_utils.py
@@ -26,7 +26,7 @@ __all__ = (
    "object_add_grid_scale_apply_operator",
    "object_image_guess",
    "world_to_camera_view",
-    )
+)


 import bpy