diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-17 13:37:50 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-10-17 13:38:54 +0300 |
commit | 7f19c4fdf920c47d288a279af64bcf151e021877 (patch) | |
tree | 6080f5ecf17f0b282ebb37fe16d1faa5fc5af2e3 /source/blender/blenloader/intern | |
parent | cd843409d3b702d319d841a07849ea8824414083 (diff) |
Fix T49738: Hair Add Brush doesn't work
the issue was caused by wrong default value for brush particle count
which was clamped on display from 0 to 1. This is technically a regression
but how to port this to 2.78a?
Diffstat (limited to 'source/blender/blenloader/intern')
-rw-r--r-- | source/blender/blenloader/intern/versioning_270.c | 14 | ||||
-rw-r--r-- | source/blender/blenloader/intern/versioning_defaults.c | 1 |
2 files changed, 15 insertions, 0 deletions
diff --git a/source/blender/blenloader/intern/versioning_270.c b/source/blender/blenloader/intern/versioning_270.c index 0d4ff00b775..a2a10f5ccd8 100644 --- a/source/blender/blenloader/intern/versioning_270.c +++ b/source/blender/blenloader/intern/versioning_270.c @@ -1425,4 +1425,18 @@ void blo_do_versions_270(FileData *fd, Library *UNUSED(lib), Main *main) } } } + + { + for (Scene *scene = main->scene.first; scene != NULL; scene = scene->id.next) { + if (scene->toolsettings != NULL) { + ToolSettings *ts = scene->toolsettings; + ParticleEditSettings *pset = &ts->particle; + for (int a = 0; a < PE_TOT_BRUSH; a++) { + if (pset->brush[a].count == 0) { + pset->brush[a].count = 10; + } + } + } + } + } } diff --git a/source/blender/blenloader/intern/versioning_defaults.c b/source/blender/blenloader/intern/versioning_defaults.c index ec817b9b261..99d9e140481 100644 --- a/source/blender/blenloader/intern/versioning_defaults.c +++ b/source/blender/blenloader/intern/versioning_defaults.c @@ -147,6 +147,7 @@ void BLO_update_defaults_startup_blend(Main *bmain) ParticleEditSettings *pset = &ts->particle; for (int a = 0; a < PE_TOT_BRUSH; a++) { pset->brush[a].strength = 0.5f; + pset->brush[a].count = 10; } pset->brush[PE_BRUSH_CUT].strength = 1.0f; } |