[Bf-blender-cvs] [79fa8f193b7] blender2.8: Fixup for view3d collection name drawing when no active object

Dalai Felinto noreply at git.blender.org
Wed Nov 14 00:34:12 CET 2018


Commit: 79fa8f193b70f37c58c915dd7792d26925061250
Author: Dalai Felinto
Date:   Tue Nov 13 21:30:10 2018 -0200
Branches: blender2.8
https://developer.blender.org/rB79fa8f193b70f37c58c915dd7792d26925061250

Fixup for view3d collection name drawing when no active object

===================================================================

M	source/blender/editors/space_view3d/view3d_draw.c

===================================================================

diff --git a/source/blender/editors/space_view3d/view3d_draw.c b/source/blender/editors/space_view3d/view3d_draw.c
index 40257d899fb..4f572e3a337 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -1133,7 +1133,7 @@ static void draw_selected_name(Scene *scene, ViewLayer *view_layer, Object *ob,
 
 	if ((ob == NULL) || (ob->mode == OB_MODE_OBJECT)) {
 		LayerCollection *layer_collection = view_layer->active_collection;
-		s += sprintf(s, " %s |", BKE_collection_ui_name_get(layer_collection->collection));
+		s += sprintf(s, " %s%s", BKE_collection_ui_name_get(layer_collection->collection), (ob == NULL) ? "" : " |");
 	}
 
 	/*



More information about the Bf-blender-cvs mailing list