[Bf-blender-cvs] [e45986291d1] sculpt-dev: Merge branch 'master' into sculpt-dev

[Pablo Dobarro]

Commit: e45986291d10e6b562cb3015356292720e9f29b8
Author: Pablo Dobarro
Date:   Sun Feb 14 17:42:08 2021 +0100
Branches: sculpt-dev
https://developer.blender.org/rBe45986291d10e6b562cb3015356292720e9f29b8

Merge branch 'master' into sculpt-dev

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



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

diff --cc source/blender/blenloader/intern/versioning_290.c
index ffc1869a37f,4980d748d0f..7ae8a3adcea
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1715,9 -1733,14 +1734,17 @@@ void blo_do_versions_290(FileData *fd, 
     * \note Keep this message at the bottom of the function.
     */
    {
+     if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "bokeh_overblur")) {
+       LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+         scene->eevee.bokeh_neighbor_max = 10.0f;
+         scene->eevee.bokeh_denoise_fac = 0.75f;
+         scene->eevee.bokeh_overblur = 5.0f;
+       }
+     }
+ 
      /* Keep this block, even when empty. */
 +    LISTBASE_FOREACH (Brush *, br, &bmain->brushes) {
 +      BKE_brush_default_input_curves_set(br);
 +    }
    }
  }
diff --cc source/blender/makesdna/DNA_scene_types.h
index 40645514b31,2362686cfce..5063ab90c45
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -2230,19 -2232,7 +2236,19 @@@ typedef enum eSculptFlags 
    SCULPT_HIDE_FACE_SETS = (1 << 17),
  } eSculptFlags;
  
- /* Sculpt.transform_mode */
++/** #Sculpt.transform_mode */
 +typedef enum eSculptTransformMode {
 +  SCULPT_TRANSFORM_MODE_ALL_VERTICES = 0,
 +  SCULPT_TRANSFORM_MODE_RADIUS_ELASTIC = 1,
 +} eSculptTrasnformMode;
 +
- /* Sculpt.transform_deform_target */
++/** #Sculpt.transform_deform_target */
 +typedef enum eSculptTransformDeformTarget {
 +  SCULPT_TRANSFORM_DEFORM_TARGET_GEOMETRY = 0,
 +  SCULPT_TRANSFORM_DEFORM_TARGET_CLOTH_SIM = 1,
 +} eSculptTransformDeformTarget;
 +
- /* ImagePaintSettings.mode */
+ /** #ImagePaintSettings.mode */
  typedef enum eImagePaintMode {
    IMAGEPAINT_MODE_MATERIAL = 0, /* detect texture paint slots from the material */
    IMAGEPAINT_MODE_IMAGE = 1,    /* select texture paint image directly */