[Bf-blender-cvs] [08142dde2c8] blender2.8: Hide object center and other info when drawing sets
Campbell Barton
noreply at git.blender.org
Fri Apr 28 15:48:13 CEST 2017
Commit: 08142dde2c87b14da505c126350bb49054cf054f
Author: Campbell Barton
Date: Fri Apr 28 23:52:02 2017 +1000
Branches: blender2.8
https://developer.blender.org/rB08142dde2c87b14da505c126350bb49054cf054f
Hide object center and other info when drawing sets
===================================================================
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 e626060a8b5..2b42a82cf49 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1270,22 +1270,25 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
DRW_shgroup_forcefield(stl, ob, sl);
}
- DRW_shgroup_object_center(stl, ob);
- DRW_shgroup_relationship_lines(stl, ob);
-
- if ((ob->dtx & OB_DRAWNAME) && DRW_state_show_text()) {
- struct DRWTextStore *dt = DRW_text_cache_ensure();
- if (theme_id == TH_UNDEFINED) {
- theme_id = DRW_object_wire_theme_get(ob, sl, NULL);
- }
+ /* don't show object extras in set's */
+ if ((ob->base_flag & BASE_FROM_SET) == 0) {
+ DRW_shgroup_object_center(stl, ob);
+ DRW_shgroup_relationship_lines(stl, ob);
+
+ if ((ob->dtx & OB_DRAWNAME) && DRW_state_show_text()) {
+ struct DRWTextStore *dt = DRW_text_cache_ensure();
+ if (theme_id == TH_UNDEFINED) {
+ theme_id = DRW_object_wire_theme_get(ob, sl, NULL);
+ }
- unsigned char color[4];
- UI_GetThemeColor4ubv(theme_id, color);
+ unsigned char color[4];
+ UI_GetThemeColor4ubv(theme_id, color);
- DRW_text_cache_add(
- dt, ob->obmat[3],
- ob->id.name + 2, strlen(ob->id.name + 2),
- 10, DRW_TEXT_CACHE_GLOBALSPACE | DRW_TEXT_CACHE_STRING_PTR, color);
+ DRW_text_cache_add(
+ dt, ob->obmat[3],
+ ob->id.name + 2, strlen(ob->id.name + 2),
+ 10, DRW_TEXT_CACHE_GLOBALSPACE | DRW_TEXT_CACHE_STRING_PTR, color);
+ }
}
}
More information about the Bf-blender-cvs
mailing list