[Bf-blender-cvs] [7f8a99a96a6] lineart-shadow: Merge branch 'temp-lineart-contained' into lineart-shadow

[YimingWu]

Commit: 7f8a99a96a61aad5a76c664f6cdab9e743a88076
Author: YimingWu
Date:   Tue Aug 10 10:59:10 2021 +0800
Branches: lineart-shadow
https://developer.blender.org/rB7f8a99a96a61aad5a76c664f6cdab9e743a88076

Merge branch 'temp-lineart-contained' into lineart-shadow

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index c694be2b7f6,badebb1791f..c560bbddced
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -704,18 -718,41 +718,51 @@@ void blo_do_versions_300(FileData *fd, 
          }
        }
      }
 +    LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
 +      LISTBASE_FOREACH (GpencilModifierData *, gpd, &ob->greasepencil_modifiers) {
 +        if (gpd->type == eGpencilModifierType_Lineart) {
 +          LineartGpencilModifierData *lmd = (LineartGpencilModifierData *)gpd;
 +          lmd->shadow_camera_near = 0.1f;
 +          lmd->shadow_camera_far = 200.0f;
 +          lmd->shadow_camera_size = 200.0f;
 +        }
 +      }
 +    }
    }
  
+   /* Font names were copied directly into ID names, see: T90417. */
+   if (!MAIN_VERSION_ATLEAST(bmain, 300, 16)) {
+     ListBase *lb = which_libbase(bmain, ID_VF);
+     BKE_main_id_repair_duplicate_names_listbase(lb);
+   }
+ 
+   if (!MAIN_VERSION_ATLEAST(bmain, 300, 17)) {
+     if (!DNA_struct_elem_find(
+             fd->filesdna, "View3DOverlay", "float", "normals_constant_screen_size")) {
+       LISTBASE_FOREACH (bScreen *, screen, &bmain->screens) {
+         LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
+           LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
+             if (sl->spacetype == SPACE_VIEW3D) {
+               View3D *v3d = (View3D *)sl;
+               v3d->overlay.normals_constant_screen_size = 7.0f;
+             }
+           }
+         }
+       }
+     }
+ 
+     /* Fix SplineIK constraint's inconsistency between binding points array and its stored size. */
+     LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
+       /* NOTE: Objects should never have SplineIK constraint, so no need to apply this fix on
+        * their constraints. */
+       if (ob->pose) {
+         LISTBASE_FOREACH (bPoseChannel *, pchan, &ob->pose->chanbase) {
+           do_version_constraints_spline_ik_joint_bindings(&pchan->constraints);
+         }
+       }
+     }
+   }
+ 
    /**
     * Versioning code until next subversion bump goes here.
     *