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:
authorCampbell Barton <ideasman42@gmail.com>2019-09-12 00:31:46 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-09-12 00:31:46 +0300
commit1e375ab5a104a71c45c1bf85ea34ab886c61e93d (patch)
treef9805ea542fbcffdb73a4ed094e9f2d35508bd52
parent32b49f9e9f2f93124c0c041104d7e7c558d8d3ad (diff)
3D View: only show origin axes when in object mode
-rw-r--r--source/blender/draw/modes/object_mode.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 663624aa050..37b271e4778 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -3687,11 +3687,13 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
}
/* Helpers for when we're transforming origins. */
- if (scene->toolsettings->transform_flag & SCE_XFORM_DATA_ORIGIN) {
- if (ob->base_flag & BASE_SELECTED) {
- const float color[4] = {0.75, 0.75, 0.75, 0.5};
- float axes_size = 1.0f;
- DRW_buffer_add_entry(sgl->origin_xform, color, &axes_size, ob->obmat);
+ if (draw_ctx->object_mode == OB_MODE_OBJECT) {
+ if (scene->toolsettings->transform_flag & SCE_XFORM_DATA_ORIGIN) {
+ if (ob->base_flag & BASE_SELECTED) {
+ const float color[4] = {0.75, 0.75, 0.75, 0.5};
+ float axes_size = 1.0f;
+ DRW_buffer_add_entry(sgl->origin_xform, color, &axes_size, ob->obmat);
+ }
}
}