GP: Harmonize Sculpt Struct and field names

Changed the following names:

- GP_EditBrush_Data->GP_Sculpt_Data
- eGP_EditBrush_Types->eGP_Sculpt_Types
- eGP_EditBrush_Flag->eGP_Sculpt_Flag
- eGP_BrushEdit_SettingsFlag->eGP_Sculpt_SettingsFlag
- GP_BrushEdit_Settings->GP_Sculpt_Settings
- GP_EDITBRUSH_FLAG*->GP_SCULPT_FLAG*
- GP_EDITBRUSH_TYPE*->GP_SCULPT_TYPE*
- GP_BRUSHEDIT_FLAG_*->GP_SCULPT_SETT_FLAG_*

2 files changed, 55 insertions, 33 deletions

diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c
index fadf332c850..e446e268e61 100644
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@ -1103,45 +1103,45 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
 			ToolSettings *ts = scene->toolsettings;
 
 			if (ts->gp_sculpt.brush[0].size == 0) {
-				GP_BrushEdit_Settings *gset = &ts->gp_sculpt;
-				GP_EditBrush_Data *brush;
+				GP_Sculpt_Settings *gset = &ts->gp_sculpt;
+				GP_Sculpt_Data *brush;
 
-				brush = &gset->brush[GP_EDITBRUSH_TYPE_SMOOTH];
+				brush = &gset->brush[GP_SCULPT_TYPE_SMOOTH];
 				brush->size = 25;
 				brush->strength = 0.3f;
-				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE;
+				brush->flag = GP_SCULPT_FLAG_USE_FALLOFF | GP_SCULPT_FLAG_SMOOTH_PRESSURE;
 
-				brush = &gset->brush[GP_EDITBRUSH_TYPE_THICKNESS];
+				brush = &gset->brush[GP_SCULPT_TYPE_THICKNESS];
 				brush->size = 25;
 				brush->strength = 0.5f;
-				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
+				brush->flag = GP_SCULPT_FLAG_USE_FALLOFF;
 
-				brush = &gset->brush[GP_EDITBRUSH_TYPE_GRAB];
+				brush = &gset->brush[GP_SCULPT_TYPE_GRAB];
 				brush->size = 50;
 				brush->strength = 0.3f;
-				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
+				brush->flag = GP_SCULPT_FLAG_USE_FALLOFF;
 
-				brush = &gset->brush[GP_EDITBRUSH_TYPE_PUSH];
+				brush = &gset->brush[GP_SCULPT_TYPE_PUSH];
 				brush->size = 25;
 				brush->strength = 0.3f;
-				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
+				brush->flag = GP_SCULPT_FLAG_USE_FALLOFF;
 
-				brush = &gset->brush[GP_EDITBRUSH_TYPE_TWIST];
+				brush = &gset->brush[GP_SCULPT_TYPE_TWIST];
 				brush->size = 50;
 				brush->strength = 0.3f; // XXX?
-				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
+				brush->flag = GP_SCULPT_FLAG_USE_FALLOFF;
 
-				brush = &gset->brush[GP_EDITBRUSH_TYPE_PINCH];
+				brush = &gset->brush[GP_SCULPT_TYPE_PINCH];
 				brush->size = 50;
 				brush->strength = 0.5f; // XXX?
-				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
+				brush->flag = GP_SCULPT_FLAG_USE_FALLOFF;
 
-				brush = &gset->brush[GP_EDITBRUSH_TYPE_RANDOMIZE];
+				brush = &gset->brush[GP_SCULPT_TYPE_RANDOMIZE];
 				brush->size = 25;
 				brush->strength = 0.5f;
-				brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
+				brush->flag = GP_SCULPT_FLAG_USE_FALLOFF;
 
-				brush = &gset->brush[GP_EDITBRUSH_TYPE_CLONE];
+				brush = &gset->brush[GP_SCULPT_TYPE_CLONE];
 				brush->size = 50;
 				brush->strength = 1.0f;
 			}
@@ -1404,17 +1404,17 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *bmain)
 			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 				ToolSettings *ts = scene->toolsettings;
 				/* initialize use position for sculpt brushes */
-				ts->gp_sculpt.flag |= GP_BRUSHEDIT_FLAG_APPLY_POSITION;
+				ts->gp_sculpt.flag |= GP_SCULPT_SETT_FLAG_APPLY_POSITION;
 
 				/* new strength sculpt brush */
 				if (ts->gp_sculpt.brush[0].size >= 11) {
-					GP_BrushEdit_Settings *gset = &ts->gp_sculpt;
-					GP_EditBrush_Data *brush;
+					GP_Sculpt_Settings *gset = &ts->gp_sculpt;
+					GP_Sculpt_Data *brush;
 
-					brush = &gset->brush[GP_EDITBRUSH_TYPE_STRENGTH];
+					brush = &gset->brush[GP_SCULPT_TYPE_STRENGTH];
 					brush->size = 25;
 					brush->strength = 0.5f;
-					brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF;
+					brush->flag = GP_SCULPT_FLAG_USE_FALLOFF;
 				}
 			}
 			/* Convert Grease Pencil to new palettes/brushes
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 0be1c048bfb..2cdc8d32cc3 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1078,12 +1078,12 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 
 		{
 			/* Grease pencil sculpt and paint cursors */
-			if (!DNA_struct_elem_find(fd->filesdna, "GP_BrushEdit_Settings", "int", "weighttype")) {
+			if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "int", "weighttype")) {
 				for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 					/* sculpt brushes */
-					GP_BrushEdit_Settings *gset = &scene->toolsettings->gp_sculpt;
+					GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt;
 					if (gset) {
-						gset->weighttype = GP_EDITBRUSH_TYPE_WEIGHT;
+						gset->weighttype = GP_SCULPT_TYPE_WEIGHT;
 					}
 				}
 			}
@@ -1092,15 +1092,15 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 				float curcolor_add[3], curcolor_sub[3];
 				ARRAY_SET_ITEMS(curcolor_add, 1.0f, 0.6f, 0.6f);
 				ARRAY_SET_ITEMS(curcolor_sub, 0.6f, 0.6f, 1.0f);
-				GP_EditBrush_Data *gp_brush;
+				GP_Sculpt_Data *gp_brush;
 
 				for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 					ToolSettings *ts = scene->toolsettings;
 					/* sculpt brushes */
-					GP_BrushEdit_Settings *gset = &ts->gp_sculpt;
-					for (int i = 0; i < GP_EDITBRUSH_TYPE_MAX; ++i) {
+					GP_Sculpt_Settings *gset = &ts->gp_sculpt;
+					for (int i = 0; i < GP_SCULPT_TYPE_MAX; ++i) {
 						gp_brush = &gset->brush[i];
-						gp_brush->flag |= GP_EDITBRUSH_FLAG_ENABLE_CURSOR;
+						gp_brush->flag |= GP_SCULPT_FLAG_ENABLE_CURSOR;
 						copy_v3_v3(gp_brush->curcolor_add, curcolor_add);
 						copy_v3_v3(gp_brush->curcolor_sub, curcolor_sub);
 					}
@@ -1122,10 +1122,10 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 			}
 
 			/* Grease pencil multiframe falloff curve */
-			if (!DNA_struct_elem_find(fd->filesdna, "GP_BrushEdit_Settings", "CurveMapping", "cur_falloff")) {
+			if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "CurveMapping", "cur_falloff")) {
 				for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 					/* sculpt brushes */
-					GP_BrushEdit_Settings *gset = &scene->toolsettings->gp_sculpt;
+					GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt;
 					if ((gset) && (gset->cur_falloff == NULL)) {
 						gset->cur_falloff = curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
 						curvemapping_initialize(gset->cur_falloff);
@@ -1962,10 +1962,10 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 		}
 
 		/* default loc axis */
-		if (!DNA_struct_elem_find(fd->filesdna, "GP_BrushEdit_Settings", "int", "lock_axis")) {
+		if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "int", "lock_axis")) {
 			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 				/* lock axis */
-				GP_BrushEdit_Settings *gset = &scene->toolsettings->gp_sculpt;
+				GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt;
 				if (gset) {
 					gset->lock_axis = GP_LOCKAXIS_Y;
 				}
@@ -2252,6 +2252,28 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
 	}
 
 	{
+		/* Grease pencil reset sculpt brushes after struct rename  */
+		if (!DNA_struct_elem_find(fd->filesdna, "GP_Sculpt_Settings", "int", "weighttype")) {
+			float curcolor_add[3], curcolor_sub[3];
+			ARRAY_SET_ITEMS(curcolor_add, 1.0f, 0.6f, 0.6f);
+			ARRAY_SET_ITEMS(curcolor_sub, 0.6f, 0.6f, 1.0f);
+
+			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
+				/* sculpt brushes */
+				GP_Sculpt_Settings *gset = &scene->toolsettings->gp_sculpt;
+				if (gset) {
+					for (int i = 0; i < GP_SCULPT_TYPE_MAX; i++) {
+						GP_Sculpt_Data *gp_brush = &gset->brush[i];
+						gp_brush->size = 30;
+						gp_brush->strength = 0.5f;
+						gp_brush->flag = GP_SCULPT_FLAG_USE_FALLOFF | GP_SCULPT_FLAG_ENABLE_CURSOR;
+						copy_v3_v3(gp_brush->curcolor_add, curcolor_add);
+						copy_v3_v3(gp_brush->curcolor_sub, curcolor_sub);
+					}
+				}
+			}
+		}
+
 		if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "overscan")) {
 			for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
 				scene->eevee.overscan = 3.0f;