Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2017-02-08 15:10:16 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2017-02-08 15:10:16 +0300
commitd4913af84660318047e3404f9766014cd78864ab (patch)
tree216516057dc8df5177e4f179392de5a79811ba3f /release
parentc973e8d2da5cf3f615256269128a07390f8c06a9 (diff)
parent8cda364d6f2e6e8da454034f19fb959739045813 (diff)
Merge branch 'master' into blender2.8
# Conflicts: # source/blender/blenloader/intern/writefile.c
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index e397a85aa58..f605712510a 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1335,9 +1335,9 @@ class VIEW3D_MT_object_clear(Menu):
def draw(self, context):
layout = self.layout
- layout.operator("object.location_clear", text="Location")
- layout.operator("object.rotation_clear", text="Rotation")
- layout.operator("object.scale_clear", text="Scale")
+ layout.operator("object.location_clear", text="Location").clear_delta = False
+ layout.operator("object.rotation_clear", text="Rotation").clear_delta = False
+ layout.operator("object.scale_clear", text="Scale").clear_delta = False
layout.operator("object.origin_clear", text="Origin")