[Bf-blender-cvs] [068f4e45927] master: Cleanup: sort file, struct lists

Campbell Barton noreply at git.blender.org
Mon Feb 10 00:46:57 CET 2020


Commit: 068f4e45927f78d40f5b553c20ce1ab5fa71cf1f
Author: Campbell Barton
Date:   Mon Feb 10 10:08:31 2020 +1100
Branches: master
https://developer.blender.org/rB068f4e45927f78d40f5b553c20ce1ab5fa71cf1f

Cleanup: sort file, struct lists

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

M	source/blender/depsgraph/CMakeLists.txt
M	source/blender/editors/sculpt_paint/sculpt_intern.h
M	source/blender/gpu/GPU_texture.h
M	source/blender/makesrna/RNA_access.h

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

diff --git a/source/blender/depsgraph/CMakeLists.txt b/source/blender/depsgraph/CMakeLists.txt
index fad8bc22e08..737d66e07cb 100644
--- a/source/blender/depsgraph/CMakeLists.txt
+++ b/source/blender/depsgraph/CMakeLists.txt
@@ -83,8 +83,8 @@ set(SRC
   intern/depsgraph_query.cc
   intern/depsgraph_query_foreach.cc
   intern/depsgraph_query_iter.cc
-  intern/depsgraph_relation.cc
   intern/depsgraph_registry.cc
+  intern/depsgraph_relation.cc
   intern/depsgraph_tag.cc
   intern/depsgraph_type.cc
   intern/depsgraph_update.cc
diff --git a/source/blender/editors/sculpt_paint/sculpt_intern.h b/source/blender/editors/sculpt_paint/sculpt_intern.h
index 5d92b202997..b29bbfd1fb0 100644
--- a/source/blender/editors/sculpt_paint/sculpt_intern.h
+++ b/source/blender/editors/sculpt_paint/sculpt_intern.h
@@ -35,9 +35,9 @@
 
 struct KeyBlock;
 struct Object;
+struct SculptPoseIKChainSegment;
 struct SculptUndoNode;
 struct bContext;
-struct SculptPoseIKChainSegment;
 
 bool sculpt_mode_poll(struct bContext *C);
 bool sculpt_mode_poll_view3d(struct bContext *C);
diff --git a/source/blender/gpu/GPU_texture.h b/source/blender/gpu/GPU_texture.h
index bb6af227369..73ea9da0fe6 100644
--- a/source/blender/gpu/GPU_texture.h
+++ b/source/blender/gpu/GPU_texture.h
@@ -31,12 +31,12 @@ extern "C" {
 #endif
 
 struct GPUVertBuf;
+struct ImBuf;
 struct Image;
 struct ImageUser;
 struct MovieClip;
 struct MovieClipUser;
 struct PreviewImage;
-struct ImBuf;
 
 struct GPUFrameBuffer;
 typedef struct GPUTexture GPUTexture;
diff --git a/source/blender/makesrna/RNA_access.h b/source/blender/makesrna/RNA_access.h
index e9c9b7e2815..54a2abdfa8c 100644
--- a/source/blender/makesrna/RNA_access.h
+++ b/source/blender/makesrna/RNA_access.h
@@ -260,7 +260,11 @@ extern StructRNA RNA_FileBrowserFSMenuEntry;
 extern StructRNA RNA_FileSelectParams;
 extern StructRNA RNA_FloatProperty;
 extern StructRNA RNA_FloorConstraint;
+extern StructRNA RNA_FluidDomainSettings;
+extern StructRNA RNA_FluidEffectorSettings;
+extern StructRNA RNA_FluidFlowSettings;
 extern StructRNA RNA_FluidFluidSettings;
+extern StructRNA RNA_FluidModifier;
 extern StructRNA RNA_FluidSettings;
 extern StructRNA RNA_FollowPathConstraint;
 extern StructRNA RNA_FreestyleLineSet;
@@ -595,10 +599,6 @@ extern StructRNA RNA_ShrinkwrapModifier;
 extern StructRNA RNA_SimpleDeformModifier;
 extern StructRNA RNA_SimplifyGpencilModifier;
 extern StructRNA RNA_SkinModifier;
-extern StructRNA RNA_FluidEffectorSettings;
-extern StructRNA RNA_FluidDomainSettings;
-extern StructRNA RNA_FluidFlowSettings;
-extern StructRNA RNA_FluidModifier;
 extern StructRNA RNA_SmoothGpencilModifier;
 extern StructRNA RNA_SmoothModifier;
 extern StructRNA RNA_SoftBodyModifier;
@@ -736,11 +736,11 @@ extern StructRNA RNA_WalkNavigation;
 extern StructRNA RNA_WarpModifier;
 extern StructRNA RNA_WaveModifier;
 extern StructRNA RNA_WeightedNormalModifier;
+extern StructRNA RNA_WeldModifier;
 extern StructRNA RNA_Window;
 extern StructRNA RNA_WindowManager;
 extern StructRNA RNA_WipeSequence;
 extern StructRNA RNA_WireframeModifier;
-extern StructRNA RNA_WeldModifier;
 extern StructRNA RNA_WoodTexture;
 extern StructRNA RNA_WorkSpace;
 extern StructRNA RNA_World;



More information about the Bf-blender-cvs mailing list