[Bf-blender-cvs] [92855f8ab7a] tracking_tools: Merge branch 'master' into tracking_tools

[Sergey Sharybin]

Commit: 92855f8ab7a4ed679c1d8375c71ac89a0794d773
Author: Sergey Sharybin
Date:   Thu Jun 9 15:56:29 2022 +0200
Branches: tracking_tools
https://developer.blender.org/rB92855f8ab7a4ed679c1d8375c71ac89a0794d773

Merge branch 'master' into tracking_tools

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 827d7278182,57240b93ab1..6dc2946ae19
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -3067,32 -3057,40 +3057,68 @@@ 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;
+   }
+ 
+   /**
+    * 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. */
++
 +    {
 +      for (bScreen *screen = bmain->screens.first; screen; screen = screen->id.next) {
 +        LISTBASE_FOREACH (ScrArea *, area, &screen->areabase) {
 +          LISTBASE_FOREACH (SpaceLink *, sl, &area->spacedata) {
 +            if (sl->spacetype != SPACE_CLIP) {
 +              continue;
 +            }
 +
 +            SpaceClip *space_clip = (SpaceClip *)sl;
 +            ListBase *regionbase = (sl == area->spacedata.first) ? &area->regionbase :
 +                                                                   &sl->regionbase;
 +
 +            ARegion *new_tool_header = do_versions_add_region_if_not_found(
 +                regionbase, RGN_TYPE_TOOL_HEADER, "tool header", RGN_TYPE_HEADER);
 +
 +            if (new_tool_header != NULL) {
 +              new_tool_header->alignment = (U.uiflag & USER_HEADER_BOTTOM) ? RGN_ALIGN_BOTTOM :
 +                                                                             RGN_ALIGN_TOP;
 +
 +              if (space_clip->view != SC_VIEW_CLIP) {
 +                new_tool_header->flag |= RGN_FLAG_HIDDEN;
 +              }
 +            }
 +          }
 +        }
 +      }
 +    }
    }
 -}
 +}
diff --cc source/blender/editors/mask/mask_add.c
index 7f9bd49a3e9,194170b1677..ec80ba05775
--- a/source/blender/editors/mask/mask_add.c
+++ b/source/blender/editors/mask/mask_add.c
@@@ -628,11 -599,13 +644,15 @@@ void MASK_OT_add_vertex(wmOperatorType 
                         "Location of vertex in normalized space",
                         -1.0f,
                         1.0f);
 +
 +  ot->prop = RNA_def_enum(ot->srna, "type", editcurve_handle_type_items, 1, "Type", "Spline type");
  }
  
- /******************** add feather vertex *********************/
+ /** \} */
+ 
+ /* -------------------------------------------------------------------- */
+ /** \name Add Feather Vertex Operator
+  * \{ */
  
  static int add_feather_vertex_exec(bContext *C, wmOperator *op)
  {