[Bf-blender-cvs] [57aea0ce19c] blender2.8: Paint: correct brush defaults

Campbell Barton noreply at git.blender.org
Tue Nov 6 22:45:22 CET 2018


Commit: 57aea0ce19c3a27cafbe13db087c92e99edfbf0b
Author: Campbell Barton
Date:   Tue Nov 6 21:08:48 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB57aea0ce19c3a27cafbe13db087c92e99edfbf0b

Paint: correct brush defaults

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

M	source/blender/windowmanager/intern/wm_toolsystem.c

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

diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c
index 04a3da5f01f..093b014957e 100644
--- a/source/blender/windowmanager/intern/wm_toolsystem.c
+++ b/source/blender/windowmanager/intern/wm_toolsystem.c
@@ -654,21 +654,14 @@ static const char *toolsystem_default_tool(const bToolKey *tkey)
 	switch (tkey->space_type) {
 		case SPACE_VIEW3D:
 			switch (tkey->mode) {
-				/* XXX(campbell): hard coded paint-brush names.
-				 * Eventyally we plan to move away from using brush names as tools,
-				 * in favor of having tool types in the toolbar, which can each select their own brush.
-				 * so keep this as a temporary hack.
-				 */
+				/* Use the names of the enums for each brush tool. */
 				case CTX_MODE_SCULPT:
-					return "SculptDraw";
 				case CTX_MODE_PAINT_VERTEX:
 				case CTX_MODE_PAINT_WEIGHT:
 				case CTX_MODE_GPENCIL_WEIGHT:
-					return "Draw";
 				case CTX_MODE_PAINT_TEXTURE:
-					return "TexDraw";
 				case CTX_MODE_GPENCIL_PAINT:
-					return "Draw Pencil";
+					return "Draw";
 				case CTX_MODE_GPENCIL_SCULPT:
 					return "Push";
 				/* end temporary hack. */



More information about the Bf-blender-cvs mailing list