[Bf-blender-cvs] [ebadb681294] temp-gpencil-bezier-stroke-type: Merge branch 'master' into temp-gpencil-bezier-stroke-type

[Antonio Vazquez]

Commit: ebadb681294e327f853256bab25cf3433e3b8b51
Author: Antonio Vazquez
Date:   Mon May 31 17:06:07 2021 +0200
Branches: temp-gpencil-bezier-stroke-type
https://developer.blender.org/rBebadb681294e327f853256bab25cf3433e3b8b51

Merge branch 'master' into temp-gpencil-bezier-stroke-type

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index dc1198977e2,c175714c537..052801ea355
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -21,8 -21,8 +21,9 @@@
  #define DNA_DEPRECATED_ALLOW
  
  #include "BLI_listbase.h"
 +#include "BLI_math.h"
  #include "BLI_math_vector.h"
+ #include "BLI_string.h"
  #include "BLI_utildefines.h"
  
  #include "DNA_brush_types.h"
@@@ -111,18 -136,23 +138,34 @@@ void blo_do_versions_300(FileData *fd, 
          }
        }
      }
 +
 +    /* Init grease pencil curve editing error threshold. */
 +    if (!DNA_struct_elem_find(
 +            fd->filesdna, "ToolSettings", "float", "gpencil_curve_fit_threshold")) {
 +      LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
 +        if (scene->toolsettings->sequencer_tool_settings == NULL) {
 +          scene->toolsettings->gpencil_curve_fit_threshold = GP_DEFAULT_CURVE_ERROR;
 +          scene->toolsettings->gpencil_curve_fit_corner_angle = GP_DEFAULT_CURVE_EDIT_CORNER_ANGLE;
 +        }
 +      }
 +    }
    }
+ 
+   if (!MAIN_VERSION_ATLEAST(bmain, 300, 2)) {
+     version_switch_node_input_prefix(bmain);
+ 
+     if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "custom_scale_xyz[3]")) {
+       LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+         if (ob->pose == NULL) {
+           continue;
+         }
+         LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
+           copy_v3_fl(pchan->custom_scale_xyz, pchan->custom_scale);
+         }
+       }
+     }
+   }
+ 
    /**
     * Versioning code until next subversion bump goes here.
     *