[Bf-blender-cvs] [f71a7d39149] master: Cleanup: Remove Unused tracking properties

[Aaron Carlisle]

Commit: f71a7d39149d3a201df4b5a322602fe04523ff07
Author: Aaron Carlisle
Date:   Fri Jan 15 14:57:16 2021 -0500
Branches: master
https://developer.blender.org/rBf71a7d39149d3a201df4b5a322602fe04523ff07

Cleanup: Remove Unused tracking properties

These properties are unused and serve no purpose.

Reviewed By: sergey, #motion_tracking

Differential Revision: https://developer.blender.org/D9803

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

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 5b6b706c83c..908b06da2ce 100644
--- a/source/blender/makesdna/DNA_tracking_types.h
+++ b/source/blender/makesdna/DNA_tracking_types.h
@@ -251,8 +251,6 @@ typedef struct MovieTrackingPlaneTrack {
 } MovieTrackingPlaneTrack;
 
 typedef struct MovieTrackingSettings {
-  int flag;
-
   /* ** default tracker settings */
   /** Model of the motion for this track. */
   short default_motion_model;
@@ -309,8 +307,6 @@ typedef struct MovieTrackingSettings {
   /* set object scale */
   /** Distance between two bundles used for object scaling. */
   float object_distance;
-
-  char _pad3[4];
 } MovieTrackingSettings;
 
 typedef struct MovieTrackingStabilization {
@@ -526,11 +522,6 @@ typedef enum eTrackFrameMatch {
   TRACK_MATCH_PREVIOS_FRAME = 1,
 } eTrackFrameMatch;
 
-/* MovieTrackingSettings->flag */
-enum {
-  TRACKING_SETTINGS_SHOW_DEFAULT_EXPANDED = (1 << 0),
-  TRACKING_SETTINGS_SHOW_EXTRA_EXPANDED = (1 << 1),
-};
 
 /* MovieTrackingSettings->motion_flag */
 enum {
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index 1870c660efd..bcf75fb284f 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -976,22 +976,6 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
   RNA_def_property_enum_items(prop, cleanup_items);
   RNA_def_property_ui_text(prop, "Action", "Cleanup action to execute");
 
-  /* ** default tracker settings ** */
-  prop = RNA_def_property(srna, "show_default_expanded", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-  RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACKING_SETTINGS_SHOW_DEFAULT_EXPANDED);
-  RNA_def_property_ui_text(
-      prop, "Show Expanded", "Show default options expanded in the user interface");
-  RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
-
-  /* ** extra tracker settings ** */
-  prop = RNA_def_property(srna, "show_extra_expanded", PROP_BOOLEAN, PROP_NONE);
-  RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
-  RNA_def_property_boolean_sdna(prop, NULL, "flag", TRACKING_SETTINGS_SHOW_EXTRA_EXPANDED);
-  RNA_def_property_ui_text(
-      prop, "Show Expanded", "Show extra options expanded in the user interface");
-  RNA_def_property_ui_icon(prop, ICON_DISCLOSURE_TRI_RIGHT, 1);
-
   /* solver settings */
   prop = RNA_def_property(srna, "use_tripod_solver", PROP_BOOLEAN, PROP_NONE);
   RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);