[Bf-blender-cvs] [929c94ee20e] master: Cleanup: warnings

Campbell Barton noreply at git.blender.org
Thu Jul 30 00:45:02 CEST 2020


Commit: 929c94ee20e04b2d887876bb453933f63c93909f
Author: Campbell Barton
Date:   Thu Jul 30 08:41:03 2020 +1000
Branches: master
https://developer.blender.org/rB929c94ee20e04b2d887876bb453933f63c93909f

Cleanup: warnings

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

M	source/blender/draw/intern/draw_common.h
M	source/blender/draw/intern/draw_fluid.c
M	source/blender/editors/sculpt_paint/sculpt_cloth.c

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

diff --git a/source/blender/draw/intern/draw_common.h b/source/blender/draw/intern/draw_common.h
index 6017cee0674..09f901c344f 100644
--- a/source/blender/draw/intern/draw_common.h
+++ b/source/blender/draw/intern/draw_common.h
@@ -30,6 +30,7 @@ struct ModifierData;
 struct FluidModifierData;
 struct Object;
 struct ParticleSystem;
+struct RegionView3D;
 struct ViewLayer;
 
 #define UBO_FIRST_COLOR colorWire
@@ -160,14 +161,14 @@ void DRW_globals_update(void);
 void DRW_globals_free(void);
 
 struct DRWView *DRW_view_create_with_zoffset(const struct DRWView *parent_view,
-                                             const RegionView3D *rv3d,
+                                             const struct RegionView3D *rv3d,
                                              float offset);
 
 int DRW_object_wire_theme_get(struct Object *ob, struct ViewLayer *view_layer, float **r_color);
 float *DRW_color_background_blend_get(int theme_id);
 
-bool DRW_object_is_flat(Object *ob, int *r_axis);
-bool DRW_object_axis_orthogonal_to_view(Object *ob, int axis);
+bool DRW_object_is_flat(struct Object *ob, int *r_axis);
+bool DRW_object_axis_orthogonal_to_view(struct Object *ob, int axis);
 
 /* draw_hair.c */
 
diff --git a/source/blender/draw/intern/draw_fluid.c b/source/blender/draw/intern/draw_fluid.c
index 2d82ed37c95..33311dc698f 100644
--- a/source/blender/draw/intern/draw_fluid.c
+++ b/source/blender/draw/intern/draw_fluid.c
@@ -37,6 +37,8 @@
 
 #include "GPU_texture.h"
 
+#include "draw_common.h" /* Own include. */
+
 #ifdef WITH_FLUID
 #  include "manta_fluid_API.h"
 #endif
diff --git a/source/blender/editors/sculpt_paint/sculpt_cloth.c b/source/blender/editors/sculpt_paint/sculpt_cloth.c
index d91d9ba8438..434206c1584 100644
--- a/source/blender/editors/sculpt_paint/sculpt_cloth.c
+++ b/source/blender/editors/sculpt_paint/sculpt_cloth.c
@@ -176,7 +176,7 @@ static void do_cloth_brush_build_constraints_task_cb_ex(
 {
   SculptThreadedTaskData *data = userdata;
   SculptSession *ss = data->ob->sculpt;
-  Brush *brush = data->brush;
+  const Brush *brush = data->brush;
 
   PBVHVertexIter vd;



More information about the Bf-blender-cvs mailing list