[Bf-blender-cvs] [00b2c7c5ccc] master: Merge branch 'blender-v2.92-release'

[Hans Goudey]

Commit: 00b2c7c5ccc38fd80b3264b248157683b366491f
Author: Hans Goudey
Date:   Wed Jan 13 11:21:09 2021 -0600
Branches: master
https://developer.blender.org/rB00b2c7c5ccc38fd80b3264b248157683b366491f

Merge branch 'blender-v2.92-release'

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



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

diff --cc source/blender/blenkernel/BKE_blender_version.h
index 575d2c8764d,a7960b6ce87..8752fd9c8cd
--- 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 0
 -#define BLENDER_FILE_SUBVERSION 13
++#define BLENDER_FILE_SUBVERSION 1
  
  /* 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_290.c
index 5cb94159ab2,743985e7650..49c8947dd04
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@@ -1561,6 -1561,16 +1561,16 @@@ void blo_do_versions_290(FileData *fd, 
      FOREACH_NODETREE_END;
    }
  
 -  if (!MAIN_VERSION_ATLEAST(bmain, 292, 13)) {
++  if (!MAIN_VERSION_ATLEAST(bmain, 293, 1)) {
+     FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+       if (ntree->type == NTREE_GEOMETRY) {
+         version_node_socket_name(ntree, GEO_NODE_BOOLEAN, "Geometry A", "Geometry 1");
+         version_node_socket_name(ntree, GEO_NODE_BOOLEAN, "Geometry B", "Geometry 2");
+       }
+     }
+     FOREACH_NODETREE_END;
+   }
+ 
    /**
     * Versioning code until next subversion bump goes here.
     *