[Bf-blender-cvs] [7bb856b3c8b] blender2.8: Fix assert creating a tools tip

Campbell Barton noreply at git.blender.org
Tue Sep 4 10:13:07 CEST 2018


Commit: 7bb856b3c8b7a4a85a2e989a6840d488ea0d547c
Author: Campbell Barton
Date:   Tue Sep 4 18:15:25 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB7bb856b3c8b7a4a85a2e989a6840d488ea0d547c

Fix assert creating a tools tip

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

M	source/blender/editors/interface/interface_region_tooltip.c

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

diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index ae98798dd7b..d2d8e2dae2c 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -378,6 +378,11 @@ static uiTooltipData *ui_tooltip_data_from_tool(bContext *C, uiBut *but)
 		return NULL;
 	}
 
+	/* Needed to get the space-data's type (below). */
+	if (CTX_wm_space_data(C) == NULL) {
+		return NULL;
+	}
+
 	char tool_name[MAX_NAME];
 	RNA_string_get(but->opptr, "name", tool_name);
 	BLI_assert(tool_name[0] != '\0');



More information about the Bf-blender-cvs mailing list