[Bf-blender-cvs] [1e375ab5a10] master: 3D View: only show origin axes when in object mode
Campbell Barton
noreply at git.blender.org
Wed Sep 11 23:33:34 CEST 2019
Commit: 1e375ab5a104a71c45c1bf85ea34ab886c61e93d
Author: Campbell Barton
Date: Thu Sep 12 07:31:46 2019 +1000
Branches: master
https://developer.blender.org/rB1e375ab5a104a71c45c1bf85ea34ab886c61e93d
3D View: only show origin axes when in object mode
===================================================================
M source/blender/draw/modes/object_mode.c
===================================================================
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);
+ }
}
}
More information about the Bf-blender-cvs
mailing list