Merge branch 'master' into blender2.8

2017-05-28 17:48:59 +02:00
parent 6dfe56f01a b947810291
commit 8ead56c4c9
70 changed files with 526 additions and 847 deletions
--- a/release/scripts/startup/bl_operators/object.py
+++ b/release/scripts/startup/bl_operators/object.py
@@ -866,7 +866,7 @@ class DupliOffsetFromCursor(Operator):
    """Set offset used for DupliGroup based on cursor position"""
    bl_idname = "object.dupli_offset_from_cursor"
    bl_label = "Set Offset From Cursor"
-    bl_options = {'REGISTER', 'UNDO'}
+    bl_options = {'INTERNAL', 'UNDO'}

    @classmethod
    def poll(cls, context):