[Bf-blender-cvs] [74c46d11a02] greasepencil-edit-curve: Merge branch 'master' into greasepencil-edit-curve

[Antonio Vazquez]

Commit: 74c46d11a0287f43a0365b4dc8a194d8547d61ba
Author: Antonio Vazquez
Date:   Fri Jun 19 19:45:05 2020 +0200
Branches: greasepencil-edit-curve
https://developer.blender.org/rB74c46d11a0287f43a0365b4dc8a194d8547d61ba

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 03b035b644b,0dd1ecd0008..bcc5890b901
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -24,9 -24,9 +24,10 @@@
  #include "BLI_utildefines.h"
  
  #include "DNA_brush_types.h"
+ #include "DNA_constraint_types.h"
  #include "DNA_genfile.h"
  #include "DNA_gpencil_modifier_types.h"
 +#include "DNA_gpencil_types.h"
  #include "DNA_modifier_types.h"
  #include "DNA_object_types.h"
  #include "DNA_screen_types.h"
@@@ -281,17 -281,26 +282,39 @@@ void blo_do_versions_290(FileData *fd, 
        }
      }
  
 +    /* Init grease pencil default curve resolution. */
 +    if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "editcurve_resolution")) {
 +      for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) {
 +        gpd->editcurve_resolution = GP_DEFAULT_CURVE_RESOLUTION;
 +      }
 +    }
 +    /* Init grease pencil curve editing error threshold. */
 +    if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "float", "curve_edit_threshold")) {
 +      for (bGPdata *gpd = bmain->gpencils.first; gpd; gpd = gpd->id.next) {
 +        gpd->curve_edit_threshold = GP_DEFAULT_CURVE_ERROR;
 +      }
 +    }
++
+     /* EEVEE Motion blur new parameters. */
+     if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "motion_blur_depth_scale")) {
+       LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
+         scene->eevee.motion_blur_depth_scale = 100.0f;
+         scene->eevee.motion_blur_max = 32;
+       }
+     }
+ 
+     /* Transition to saving expansion for all of a constraint's subpanels. */
+     if (!DNA_struct_elem_find(fd->filesdna, "bConstraint", "short", "ui_expand_flag")) {
+       for (Object *object = bmain->objects.first; object != NULL; object = object->id.next) {
+         LISTBASE_FOREACH (bConstraint *, con, &object->constraints) {
+           if (con->flag & CONSTRAINT_EXPAND_DEPRECATED) {
+             con->ui_expand_flag = 1;
+           }
+           else {
+             con->ui_expand_flag = 0;
+           }
+         }
+       }
+     }
    }
  }