blender
/
blender
126
393
Fork 565
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Fluid: Add missing versioning for new options in 'Viewport Display' panel 

Files created before D8705 was merged need to get initial values for the new viewport display fields.
This commit is contained in:
Sebastián Barschkis 2020-10-20 14:06:33 +02:00
parent 14c0897671
commit 5bd7eda093
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
source/blender/blenloader/intern/versioning_290.c
View File

@ -30,6 +30,7 @@
#include "DNA_brush_types.h"
#include "DNA_cachefile_types.h"
#include "DNA_constraint_types.h"
#include "DNA_fluid_types.h"
#include "DNA_genfile.h"
#include "DNA_gpencil_modifier_types.h"
#include "DNA_gpencil_types.h"
@ -768,6 +769,25 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
}
/* Ensure that new viewport display fields are initialized correctly. */
LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
LISTBASE_FOREACH (ModifierData *, md, &ob->modifiers) {
if (md->type == eModifierType_Fluid) {
FluidModifierData *fmd = (FluidModifierData *)md;
if (fmd->domain != NULL) {
if (!fmd->domain->coba_field && fmd->domain->type == FLUID_DOMAIN_TYPE_LIQUID) {
fmd->domain->coba_field = FLUID_DOMAIN_FIELD_PHI;
}
fmd->domain->grid_scale = 1.0;
fmd->domain->gridlines_upper_bound = 1.0;
fmd->domain->vector_scale_with_magnitude = true;
const float grid_lines[4] = {1.0, 0.0, 0.0, 1.0};
copy_v4_v4(fmd->domain->gridlines_range_color, grid_lines);
}
}
}
}
}
if (!MAIN_VERSION_ATLEAST(bmain, 291, 6)) {