[Bf-blender-cvs] [f3e4a3473e2] master: Cleanup: Remove useless duplicated lines
Valentin
noreply at git.blender.org
Thu Jul 2 23:01:05 CEST 2020
Commit: f3e4a3473e29432e75bc8d19855ca3e9cff36c35
Author: Valentin
Date: Thu Jul 2 16:34:17 2020 -0400
Branches: master
https://developer.blender.org/rBf3e4a3473e29432e75bc8d19855ca3e9cff36c35
Cleanup: Remove useless duplicated lines
I spotted a duplicate struct declaration, so I had to check for other duplicated as well
There might be some other but i am not confident enough for deleting them
this regex search for duplicate ^(.*;)$\n(\1)$
Reviewed By: JacquesLucke
Differential Revision: https://developer.blender.org/D8146
===================================================================
M release/datafiles/locale
M release/scripts/addons
M source/blender/blenkernel/BKE_paint.h
M source/blender/blenkernel/BKE_particle.h
M source/blender/blenkernel/BKE_subsurf.h
M source/blender/editors/include/ED_armature.h
M source/blender/editors/include/ED_mesh.h
M source/blender/editors/include/ED_node.h
M source/blender/editors/include/ED_object.h
M source/blender/editors/include/UI_interface.h
M source/blender/makesrna/intern/rna_tracking.c
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index caf68fed42f..f1ab6e28bf1 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit caf68fed42f55e606b14c7105f5df694957ce036
+Subproject commit f1ab6e28bf1626daf898fc65e144f1e4e4f2098a
diff --git a/release/scripts/addons b/release/scripts/addons
index bc1262f4d61..9128155de32 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit bc1262f4d61feeba235bb75046e65e0e8411241f
+Subproject commit 9128155de32592d84b08426a54ae1e56f02d4635
diff --git a/source/blender/blenkernel/BKE_paint.h b/source/blender/blenkernel/BKE_paint.h
index 78092884655..e08d3fe26fb 100644
--- a/source/blender/blenkernel/BKE_paint.h
+++ b/source/blender/blenkernel/BKE_paint.h
@@ -57,7 +57,6 @@ struct ReportList;
struct Scene;
struct StrokeCache;
struct SubdivCCG;
-struct SubdivCCG;
struct Tex;
struct ToolSettings;
struct UnifiedPaintSettings;
diff --git a/source/blender/blenkernel/BKE_particle.h b/source/blender/blenkernel/BKE_particle.h
index 00d010cd6d9..a22cb9ef126 100644
--- a/source/blender/blenkernel/BKE_particle.h
+++ b/source/blender/blenkernel/BKE_particle.h
@@ -48,7 +48,6 @@ struct BVHTreeRay;
struct BVHTreeRayHit;
struct CustomData_MeshMasks;
struct Depsgraph;
-struct Depsgraph;
struct EdgeHash;
struct KDTree_3d;
struct LatticeDeformData;
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h
index 2dee8de4dc7..0ed58180ffa 100644
--- a/source/blender/blenkernel/BKE_subsurf.h
+++ b/source/blender/blenkernel/BKE_subsurf.h
@@ -45,7 +45,6 @@ struct Mesh;
struct MeshElemMap;
struct Object;
struct PBVH;
-struct PBVH;
struct SubsurfModifierData;
/**************************** External *****************************/
diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h
index eef431c40fa..d82c7126cf2 100644
--- a/source/blender/editors/include/ED_armature.h
+++ b/source/blender/editors/include/ED_armature.h
@@ -34,7 +34,6 @@ struct Depsgraph;
struct IDProperty;
struct ListBase;
struct Main;
-struct Main;
struct Mesh;
struct MeshDeformModifierData;
struct Object;
diff --git a/source/blender/editors/include/ED_mesh.h b/source/blender/editors/include/ED_mesh.h
index 9c49d991182..046eadb2ec3 100644
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@ -47,8 +47,6 @@ struct ReportList;
struct Scene;
struct UndoType;
struct UvMapVert;
-struct UvMapVert;
-struct UvVertMap;
struct UvVertMap;
struct View3D;
struct ViewContext;
diff --git a/source/blender/editors/include/ED_node.h b/source/blender/editors/include/ED_node.h
index 3471f9dcce9..47ccc0788c2 100644
--- a/source/blender/editors/include/ED_node.h
+++ b/source/blender/editors/include/ED_node.h
@@ -31,7 +31,6 @@ extern "C" {
struct ID;
struct Main;
struct Scene;
-struct Scene;
struct ScrArea;
struct Tex;
struct View2D;
@@ -40,7 +39,6 @@ struct bNode;
struct bNodeSocket;
struct bNodeSocketType;
struct bNodeTree;
-struct bNodeTree;
struct bNodeTreeType;
struct bNodeType;
diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h
index e04d30892d7..10cd6980c90 100644
--- a/source/blender/editors/include/ED_object.h
+++ b/source/blender/editors/include/ED_object.h
@@ -34,7 +34,6 @@ extern "C" {
struct Base;
struct Depsgraph;
struct EnumPropertyItem;
-struct EnumPropertyItem;
struct ID;
struct Main;
struct ModifierData;
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index 1cedd4e122f..da3d06230e3 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -65,7 +65,6 @@ struct uiWidgetColors;
struct wmDrag;
struct wmDropBox;
struct wmEvent;
-struct wmEvent;
struct wmGizmo;
struct wmKeyConfig;
struct wmKeyMap;
diff --git a/source/blender/makesrna/intern/rna_tracking.c b/source/blender/makesrna/intern/rna_tracking.c
index 81bbfd8fa14..54fe2e4b513 100644
--- a/source/blender/makesrna/intern/rna_tracking.c
+++ b/source/blender/makesrna/intern/rna_tracking.c
@@ -1036,7 +1036,6 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
/* default_tracking_motion_model */
prop = RNA_def_property(srna, "default_motion_model", PROP_ENUM, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
- RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_enum_items(prop, tracker_motion_model);
RNA_def_property_ui_text(prop, "Motion Model", "Default motion model to use for tracking");
@@ -1070,7 +1069,6 @@ static void rna_def_trackingSettings(BlenderRNA *brna)
/* default minimal correlation */
prop = RNA_def_property(srna, "default_correlation_min", PROP_FLOAT, PROP_NONE);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
- RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_float_sdna(prop, NULL, "default_minimum_correlation");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.05, 3);
@@ -1203,7 +1201,6 @@ static void rna_def_trackingCamera(BlenderRNA *brna)
prop = RNA_def_property(srna, "units", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "units");
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
- RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_enum_items(prop, camera_units_items);
RNA_def_property_ui_text(prop, "Units", "Units used for camera focal length");
More information about the Bf-blender-cvs
mailing list