From 50f188814fe324cd7837b52a528a0a7d58febdc7 Mon Sep 17 00:00:00 2001 From: Bastien Montagne Date: Thu, 3 Mar 2016 15:48:50 +0100 Subject: Fix T47676: Broken default values for particle brush strength. Current startup .blend has old (percent?) values for particle brush strength. Since rBe4e21480d6331903c90ab073746484498441e1ac, UI controls do not clamp automatically values anymore, which means when you first enable comb (or any other brush) you get a 50 strength, waaaayyyy to powerful. This commit fixes this in `BLO_update_defaults_startup_blend`, note that it does not fix custom users' startup files, nothing to do here... --- source/blender/blenkernel/intern/scene.c | 4 ++-- source/blender/blenloader/intern/versioning_defaults.c | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 3c6498e0236..3e086c77c5a 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -650,12 +650,12 @@ void BKE_scene_init(Scene *sce) pset->fade_frames = 2; pset->selectmode = SCE_SELECT_PATH; for (a = 0; a < PE_TOT_BRUSH; a++) { - pset->brush[a].strength = 0.5; + pset->brush[a].strength = 0.5f; pset->brush[a].size = 50; pset->brush[a].step = 10; pset->brush[a].count = 10; } - pset->brush[PE_BRUSH_CUT].strength = 100; + pset->brush[PE_BRUSH_CUT].strength = 1.0f; sce->r.ffcodecdata.audio_mixrate = 48000; sce->r.ffcodecdata.audio_volume = 1.0f; diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index fb4aa53f8ef..5b30aed01d2 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -144,6 +144,12 @@ void BLO_update_defaults_startup_blend(Main *bmain) ts->gpencil_v2d_align = GP_PROJECT_VIEWSPACE; ts->gpencil_seq_align = GP_PROJECT_VIEWSPACE; ts->gpencil_ima_align = GP_PROJECT_VIEWSPACE; + + ParticleEditSettings *pset = &ts->particle; + for (int a = 0; a < PE_TOT_BRUSH; a++) { + pset->brush[a].strength = 0.5f; + } + pset->brush[PE_BRUSH_CUT].strength = 1.0f; } scene->gm.lodflag |= SCE_LOD_USE_HYST; -- cgit v1.2.3