[Bf-blender-cvs] [ec71054a9b7] master: Merge branch 'blender-v3.0-release'

[Bastien Montagne]

Commit: ec71054a9b7bf0d2218fa230855fc9af2e71bcc2
Author: Bastien Montagne
Date:   Fri Nov 19 16:10:28 2021 +0100
Branches: master
https://developer.blender.org/rBec71054a9b7bf0d2218fa230855fc9af2e71bcc2

Merge branch 'blender-v3.0-release'

Conflicts:
	source/blender/blenkernel/BKE_blender_version.h
	source/blender/blenloader/intern/versioning_300.c

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



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

diff --cc source/blender/blenkernel/BKE_blender_version.h
index 43784b5a856,326ca746292..966d6c95421
--- a/source/blender/blenkernel/BKE_blender_version.h
+++ b/source/blender/blenkernel/BKE_blender_version.h
@@@ -39,7 -39,7 +39,7 @@@ extern "C" 
  
  /* Blender file format version. */
  #define BLENDER_FILE_VERSION BLENDER_VERSION
- #define BLENDER_FILE_SUBVERSION 2
 -#define BLENDER_FILE_SUBVERSION 42
++#define BLENDER_FILE_SUBVERSION 3
  
  /* Minimum Blender version that supports reading file written with the current
   * version. Older Blender versions will test this and show a warning if the file
diff --cc source/blender/blenloader/intern/versioning_300.c
index 095247e5748,18baebf57fb..125f3be0dd1
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -2170,21 -2298,36 +2310,12 @@@ void blo_do_versions_300(FileData *fd, 
      }
    }
  
-   /**
-    * Versioning code until next subversion bump goes here.
-    *
-    * \note Be sure to check when bumping the version:
-    * - "versioning_userdef.c", #blo_do_versions_userdef
-    * - "versioning_userdef.c", #do_versions_theme
-    *
-    * \note Keep this message at the bottom of the function.
-    */
-   {
-     /* Keep this block, even when empty. */
- 
+   if (!MAIN_VERSION_ATLEAST(bmain, 300, 42)) {
 -    /* Update LibOverride operations regarding insertions in RNA collections (i.e. modifiers,
 -     * constraints and NLA tracks). */
 -    ID *id_iter;
 -    FOREACH_MAIN_ID_BEGIN (bmain, id_iter) {
 -      if (ID_IS_OVERRIDE_LIBRARY_REAL(id_iter)) {
 -        version_liboverride_rnacollections_insertion_animdata(id_iter);
 -        if (GS(id_iter->name) == ID_OB) {
 -          version_liboverride_rnacollections_insertion_object((Object *)id_iter);
 -        }
 -      }
 -    }
 -    FOREACH_MAIN_ID_END;
 -
+     /* Use consistent socket identifiers for the math node.
+      * The code to make unique identifiers from the names was inconsistent. */
      FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
 -      if (ELEM(ntree->type, NTREE_SHADER, NTREE_GEOMETRY)) {
 -        LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
 -          if (node->type == SH_NODE_MATH) {
 -            bNodeSocket *value1 = ((bNodeSocket *)node->inputs.first)->next;
 -            bNodeSocket *value2 = value1->next;
 -            strcpy(value1->identifier, "Value_001");
 -            if (value2 != NULL) {
 -              /* This can be null when file is quite old so that the socket did not exist
 -               * (before 0406eb110332a8). */
 -              strcpy(value2->identifier, "Value_002");
 -            }
 -          }
 -        }
 +      if (ntree->type != NTREE_CUSTOM) {
 +        version_node_tree_socket_id_delim(ntree);
        }
      }
      FOREACH_NODETREE_END;
@@@ -2235,4 -2359,16 +2366,35 @@@
        }
      }
    }
+ 
++  /* Special case to handle older in-dev 3.1 files, before change from 3.0 branch gets merged in
++   * master. */
++  if (!MAIN_VERSION_ATLEAST(bmain, 300, 42) ||
++      (bmain->versionfile == 301 && !MAIN_VERSION_ATLEAST(bmain, 301, 3))) {
++    /* Update LibOverride operations regarding insertions in RNA collections (i.e. modifiers,
++     * constraints and NLA tracks). */
++    ID *id_iter;
++    FOREACH_MAIN_ID_BEGIN (bmain, id_iter) {
++      if (ID_IS_OVERRIDE_LIBRARY_REAL(id_iter)) {
++        version_liboverride_rnacollections_insertion_animdata(id_iter);
++        if (GS(id_iter->name) == ID_OB) {
++          version_liboverride_rnacollections_insertion_object((Object *)id_iter);
++        }
++      }
++    }
++    FOREACH_MAIN_ID_END;
++  }
++
+   /**
+    * Versioning code until next subversion bump goes here.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #blo_do_versions_userdef
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
++    /* Keep this block, even when empty. */
+   }
  }