[Bf-blender-cvs] [31dd80e0de0] master: Cleanup: unused struct members

Campbell Barton noreply at git.blender.org
Wed Jun 24 06:31:25 CEST 2020


Commit: 31dd80e0de0d9ec75d65282248e3e6a51d9be65f
Author: Campbell Barton
Date:   Tue Jun 23 23:46:26 2020 +1000
Branches: master
https://developer.blender.org/rB31dd80e0de0d9ec75d65282248e3e6a51d9be65f

Cleanup: unused struct members

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

M	source/blender/draw/engines/external/external_engine.c
M	source/blender/editors/armature/meshlaplacian.c
M	source/blender/editors/sculpt_paint/sculpt.c
M	source/blender/gpu/intern/gpu_platform.c
M	source/blender/gpu/intern/gpu_state.c

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

diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c
index 2f448b784ed..3ef20dbe9ec 100644
--- a/source/blender/draw/engines/external/external_engine.c
+++ b/source/blender/draw/engines/external/external_engine.c
@@ -97,8 +97,6 @@ typedef struct EXTERNAL_PrivateData {
   /* Do we need to update the depth or can we reuse the last calculated texture. */
   bool need_depth;
   bool update_depth;
-
-  float last_persmat[4][4];
 } EXTERNAL_PrivateData; /* Transient data */
 
 /* Functions */
diff --git a/source/blender/editors/armature/meshlaplacian.c b/source/blender/editors/armature/meshlaplacian.c
index d8a6a22a7df..145071522ed 100644
--- a/source/blender/editors/armature/meshlaplacian.c
+++ b/source/blender/editors/armature/meshlaplacian.c
@@ -94,9 +94,8 @@ struct LaplacianSystem {
     float (*verts)[3]; /* vertex coordinates */
     float (*vnors)[3]; /* vertex normals */
 
-    float (*root)[3];   /* bone root */
-    float (*tip)[3];    /* bone tip */
-    float (*source)[3]; /* vertex source */
+    float (*root)[3]; /* bone root */
+    float (*tip)[3];  /* bone tip */
     int numsource;
 
     float *H;       /* diagonal H matrix */
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index cdffe31041a..8bb6701436a 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2611,11 +2611,6 @@ static void update_brush_local_mat(Sculpt *sd, Object *ob)
   }
 }
 
-/* Note: uses after-struct allocated mem to store actual cache... */
-typedef struct SculptDoBrushSmoothGridDataChunk {
-  size_t tmpgrid_size;
-} SculptDoBrushSmoothGridDataChunk;
-
 typedef struct {
   SculptSession *ss;
   const float *ray_start;
diff --git a/source/blender/gpu/intern/gpu_platform.c b/source/blender/gpu/intern/gpu_platform.c
index a758787466f..5cabde61bc3 100644
--- a/source/blender/gpu/intern/gpu_platform.c
+++ b/source/blender/gpu/intern/gpu_platform.c
@@ -44,6 +44,8 @@ static struct GPUPlatformGlobal {
   char *gpu_name;
 } GPG = {false};
 
+/* Remove this? */
+#if 0
 typedef struct GPUPlatformSupportTest {
   eGPUSupportLevel support_level;
   eGPUDeviceType device;
@@ -53,6 +55,7 @@ typedef struct GPUPlatformSupportTest {
   const char *renderer;
   const char *version;
 } GPUPlatformSupportTest;
+#endif
 
 eGPUSupportLevel GPU_platform_support_level(void)
 {
diff --git a/source/blender/gpu/intern/gpu_state.c b/source/blender/gpu/intern/gpu_state.c
index 908f5fa5771..30b258a73d1 100644
--- a/source/blender/gpu/intern/gpu_state.c
+++ b/source/blender/gpu/intern/gpu_state.c
@@ -208,7 +208,7 @@ typedef struct {
   uint is_cull_face : 1;
   uint is_depth_test : 1;
   uint is_dither : 1;
-  uint is_lighting : 1;
+  /* uint is_lighting : 1; */ /* UNUSED */
   uint is_line_smooth : 1;
   uint is_color_logic_op : 1;
   uint is_multisample : 1;



More information about the Bf-blender-cvs mailing list