[Bf-blender-cvs] [ddce8e9ea38] retopo_transform: Merge branch 'master' into transform_api

[jon denning]

Commit: ddce8e9ea382c80017dd679a5a6f9f3db39dff9f
Author: jon denning
Date:   Wed Jun 8 10:37:56 2022 -0400
Branches: retopo_transform
https://developer.blender.org/rBddce8e9ea382c80017dd679a5a6f9f3db39dff9f

Merge branch 'master' into transform_api

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 29ff7d7a0ae,57240b93ab1..23d844c1256
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -3067,12 -3057,40 +3057,48 @@@ void blo_do_versions_300(FileData *fd, 
        }
      }
  
+     /* Use the curves type enum for the set spline type node, instead of a special one. */
+     FOREACH_NODETREE_BEGIN (bmain, ntree, id) {
+       if (ntree->type == NTREE_GEOMETRY) {
+         LISTBASE_FOREACH (bNode *, node, &ntree->nodes) {
+           if (node->type == GEO_NODE_CURVE_SPLINE_TYPE) {
+             NodeGeometryCurveSplineType *storage = (NodeGeometryCurveSplineType *)node->storage;
+             switch (storage->spline_type) {
+               case 0: /* GEO_NODE_SPLINE_TYPE_BEZIER */
+                 storage->spline_type = CURVE_TYPE_BEZIER;
+                 break;
+               case 1: /* GEO_NODE_SPLINE_TYPE_NURBS */
+                 storage->spline_type = CURVE_TYPE_NURBS;
+                 break;
+               case 2: /* GEO_NODE_SPLINE_TYPE_POLY */
+                 storage->spline_type = CURVE_TYPE_POLY;
+                 break;
+             }
+           }
+         }
+       }
+     }
+     FOREACH_NODETREE_END;
++
 +    LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
 +      ToolSettings *tool_settings = scene->toolsettings;
 +      /* Minimum of snap steps for face nearest is 1. */
 +      tool_settings->snap_face_nearest_steps = 1;
 +      /* Set snap to edited and nonedited as default. */
 +      tool_settings->snap_flag |= SCE_SNAP_TO_INCLUDE_EDITED | SCE_SNAP_TO_INCLUDE_NONEDITED;
 +    }
    }
+ 
+   /**
+    * 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. */
+   }
  }