diff options
| author | Antonioya <blendergit@gmail.com> | 2018-11-18 21:28:54 +0300 |
|---|---|---|
| committer | Antonioya <blendergit@gmail.com> | 2018-11-18 21:30:20 +0300 |
| commit | 64920a8febde6df596fe7c8e62c570db2f29ab95 (patch) | |
| tree | ce640bb6340f97c1d5ccdb52829d082dc266576e /source/blender/blenkernel/intern/scene.c | |
| parent | 991bb0076219d944225304175ac7ad58b881d173 (diff) | |
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_*
Diffstat (limited to 'source/blender/blenkernel/intern/scene.c')
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index f4e918da4f0..5213afc3805 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -775,65 +775,65 @@ void BKE_scene_init(Scene *sce) /* GP Sculpt brushes */ { - GP_BrushEdit_Settings *gset = &sce->toolsettings->gp_sculpt; - GP_EditBrush_Data *gp_brush; + GP_Sculpt_Settings *gset = &sce->toolsettings->gp_sculpt; + GP_Sculpt_Data *gp_brush; 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_brush = &gset->brush[GP_EDITBRUSH_TYPE_SMOOTH]; + gp_brush = &gset->brush[GP_SCULPT_TYPE_SMOOTH]; gp_brush->size = 25; gp_brush->strength = 0.3f; - gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_SMOOTH_PRESSURE | GP_EDITBRUSH_FLAG_ENABLE_CURSOR; + gp_brush->flag = GP_SCULPT_FLAG_USE_FALLOFF | GP_SCULPT_FLAG_SMOOTH_PRESSURE | GP_SCULPT_FLAG_ENABLE_CURSOR; copy_v3_v3(gp_brush->curcolor_add, curcolor_add); copy_v3_v3(gp_brush->curcolor_sub, curcolor_sub); - gp_brush = &gset->brush[GP_EDITBRUSH_TYPE_THICKNESS]; + gp_brush = &gset->brush[GP_SCULPT_TYPE_THICKNESS]; gp_brush->size = 25; gp_brush->strength = 0.5f; - gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR; + 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); - gp_brush = &gset->brush[GP_EDITBRUSH_TYPE_STRENGTH]; + gp_brush = &gset->brush[GP_SCULPT_TYPE_STRENGTH]; gp_brush->size = 25; gp_brush->strength = 0.5f; - gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR; + 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); - gp_brush = &gset->brush[GP_EDITBRUSH_TYPE_GRAB]; + gp_brush = &gset->brush[GP_SCULPT_TYPE_GRAB]; gp_brush->size = 50; gp_brush->strength = 0.3f; - gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR; + 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); - gp_brush = &gset->brush[GP_EDITBRUSH_TYPE_PUSH]; + gp_brush = &gset->brush[GP_SCULPT_TYPE_PUSH]; gp_brush->size = 25; gp_brush->strength = 0.3f; - gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR; + 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); - gp_brush = &gset->brush[GP_EDITBRUSH_TYPE_TWIST]; + gp_brush = &gset->brush[GP_SCULPT_TYPE_TWIST]; gp_brush->size = 50; - gp_brush->strength = 0.3f; // XXX? - gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR; + gp_brush->strength = 0.3f; + 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); - gp_brush = &gset->brush[GP_EDITBRUSH_TYPE_PINCH]; + gp_brush = &gset->brush[GP_SCULPT_TYPE_PINCH]; gp_brush->size = 50; - gp_brush->strength = 0.5f; // XXX? - gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR; + 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); - gp_brush = &gset->brush[GP_EDITBRUSH_TYPE_RANDOMIZE]; + gp_brush = &gset->brush[GP_SCULPT_TYPE_RANDOMIZE]; gp_brush->size = 25; gp_brush->strength = 0.5f; - gp_brush->flag = GP_EDITBRUSH_FLAG_USE_FALLOFF | GP_EDITBRUSH_FLAG_ENABLE_CURSOR; + 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); } |