Commit: 9c7adcfd8b58b01dba6dd3abd871fc82c71b5ad7
Author: Campbell Barton
Date: Mon Jan 14 14:16:08 2019 +1100
Branches: master
https://developer.blender.org/rB9c7adcfd8b58b01dba6dd3abd871fc82c71b5ad7
Fix T60388: Warning entering text edit mode
===================================================================
M release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
M source/blender/windowmanager/intern/wm_toolsystem.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
index 8f4a2ca1c84..5fde3176911 100644
--- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py
@@ -1602,6 +1602,11 @@ class VIEW3D_PT_tools_active(ToolSelectPanelHelper,
Panel):
'EDIT_LATTICE': [
*_tools_default,
],
+ 'EDIT_TEXT': [
+ _defs_view3d_generic.cursor,
+ None,
+ *_tools_annotate,
+ ],
'PARTICLE': [
_defs_view3d_generic.cursor,
_defs_particle.generate_from_brushes,
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c
b/source/blender/windowmanager/intern/wm_toolsystem.c
index 1d78e64cd0c..3bef4e3482a 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -801,6 +801,8 @@ static const char *toolsystem_default_tool(const bToolKey
*tkey)
case CTX_MODE_PARTICLE:
return "Comb";
+ case CTX_MODE_EDIT_TEXT:
+ return "Cursor";
}
break;
case SPACE_IMAGE:
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
