[Bf-blender-cvs] [3d0383d2593] blender2.8: Fix T57737: crash displaying expanded tooltip for transform tool

Philipp Oeser noreply at git.blender.org
Fri Nov 9 16:37:46 CET 2018


Commit: 3d0383d25932aab3091bf321b3a43e51329882fb
Author: Philipp Oeser
Date:   Fri Nov 9 13:14:10 2018 +0100
Branches: blender2.8
https://developer.blender.org/rB3d0383d25932aab3091bf321b3a43e51329882fb

Fix T57737: crash displaying expanded tooltip for transform tool

Maniphest Tasks: T57737

Differential Revision: https://developer.blender.org/D3923

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

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

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

diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c
index d1874d5298b..e1c8b00cfef 100644
--- a/source/blender/editors/interface/interface_region_tooltip.c
+++ b/source/blender/editors/interface/interface_region_tooltip.c
@@ -330,7 +330,7 @@ static bool ui_tooltip_data_append_from_keymap(
 				            .color_id = UI_TIP_LC_MAIN,
 				            .is_pad = true,
 				        });
-				field->text = BLI_strdup(ot->description[0] ? ot->description : ot->name);
+				field->text = BLI_strdup(ot->description ? ot->description : ot->name);
 			}
 			/* Shortcut */
 			{
diff --git a/source/blender/editors/transform/transform_ops.c b/source/blender/editors/transform/transform_ops.c
index 853816e8dc9..d11cfa8d3d3 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -1170,6 +1170,7 @@ static void TRANSFORM_OT_from_gizmo(struct wmOperatorType *ot)
 {
 	/* identifiers */
 	ot->name   = "Transform From Gizmo";
+	ot->description = "Transform selected items by mode type";
 	ot->idname = "TRANSFORM_OT_from_gizmo";
 	ot->flag = 0;



More information about the Bf-blender-cvs mailing list