[Bf-blender-cvs] [c949062c6ee] master: Tracking: Cleanup pattern match DNA definition

[Sergey Sharybin]

Commit: c949062c6eeedf7c6b0fb3029217effd301575c5
Author: Sergey Sharybin
Date:   Mon Nov 30 14:56:47 2020 +0100
Branches: master
https://developer.blender.org/rBc949062c6eeedf7c6b0fb3029217effd301575c5

Tracking: Cleanup pattern match DNA definition

Wrong comment was used for enumerator.

Also made it a real typed enumerator to ease use in the implementation
code.

Should be no functional changes.

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

M	source/blender/makesdna/DNA_tracking_types.h
M	source/blender/makesrna/intern/rna_tracking.c

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

diff --git a/source/blender/makesdna/DNA_tracking_types.h b/source/blender/makesdna/DNA_tracking_types.h
index 8ec9a260e18..5b6b706c83c 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -165,7 +165,8 @@ typedef struct MovieTrackingTrack {
   short frames_limit;
   /** Margin from frame boundaries. */
   short margin;
-  /** Re-adjust every N frames. */
+  /** Denotes which frame is used for the reference during tracking.
+   * An enumerator of `eTrackFrameMatch`. */
   short pattern_match;
 
   /* tracking parameters */
@@ -268,7 +269,8 @@ typedef struct MovieTrackingSettings {
   short default_frames_limit;
   /** Margin from frame boundaries. */
   short default_margin;
-  /** Re-adjust every N frames. */
+  /** Denotes which frame is used for the reference during tracking.
+   * An enumerator of `eTrackFrameMatch`. */
   short default_pattern_match;
   /** Default flags like color channels used by default. */
   short default_flag;
@@ -518,11 +520,11 @@ enum {
   TRACK_ALGORITHM_FLAG_USE_MASK = (1 << 3),
 };
 
-/* MovieTrackingTrack->adjframes */
-enum {
+/* MovieTrackingTrack->pattern_match */
+typedef enum eTrackFrameMatch {
   TRACK_MATCH_KEYFRAME = 0,
-  TRACK_MATCH_PREVFRAME = 1,
-};
+  TRACK_MATCH_PREVIOS_FRAME = 1,
+} eTrackFrameMatch;
 
 /* MovieTrackingSettings->flag */
 enum {
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index f9597fdd7af..1870c660efd 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -856,7 +856,7 @@ static const EnumPropertyItem tracker_motion_model[] = {
 
 static const EnumPropertyItem pattern_match_items[] = {
     {TRACK_MATCH_KEYFRAME, "KEYFRAME", 0, "Keyframe", "Track pattern from keyframe to next frame"},
-    {TRACK_MATCH_PREVFRAME,
+    {TRACK_MATCH_PREVIOS_FRAME,
      "PREV_FRAME",
      0,
      "Previous frame",