[Bf-blender-cvs] [42c6ebfae85] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 42c6ebfae85888f77d24736ccb32830136bed8ef
Author: Antonio Vazquez
Date:   Mon Oct 19 15:53:08 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB42c6ebfae85888f77d24736ccb32830136bed8ef

Merge branch 'master' into greasepencil-edit-curve

 Conflicts:
	source/blender/blenloader/intern/versioning_290.c

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/versioning_290.c
index 6a516a1f312,58dcce72823..f27c0739a47
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -854,20 -855,14 +855,28 @@@ void blo_do_versions_290(FileData *fd, 
          }
        }
      }
+ 
+     /* Ensure that particle systems generated by fluid modifier have correct phystype. */
+     LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) {
+       if (ELEM(
+               part->type, PART_FLUID_FLIP, PART_FLUID_SPRAY, PART_FLUID_BUBBLE, PART_FLUID_FOAM)) {
+         part->phystype = PART_PHYS_NO;
+       }
+     }
 +    /* Init grease pencil default curve resolution. */
 +    if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "curve_edit_resolution")) {
 +      LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
 +        gpd->curve_edit_resolution = GP_DEFAULT_CURVE_RESOLUTION;
 +        gpd->flag |= GP_DATA_CURVE_ADAPTIVE_RESOLUTION;
 +      }
 +    }
 +    /* Init grease pencil curve editing error threshold. */
 +    if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "float", "curve_edit_threshold")) {
 +      LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
 +        gpd->curve_edit_threshold = GP_DEFAULT_CURVE_ERROR;
 +        gpd->curve_edit_corner_angle = GP_DEFAULT_CURVE_EDIT_CORNER_ANGLE;
 +      }
 +    }
    }
  
    /**