[Bf-blender-cvs] [3bdf1c11fb1] master: Cleanup: warnings

Campbell Barton noreply at git.blender.org
Thu Jun 9 02:30:50 CEST 2022


Commit: 3bdf1c11fb15df96355cc79e885e0d7aa1dc3afb
Author: Campbell Barton
Date:   Thu Jun 9 10:16:19 2022 +1000
Branches: master
https://developer.blender.org/rB3bdf1c11fb15df96355cc79e885e0d7aa1dc3afb

Cleanup: warnings

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

M	source/blender/blenkernel/intern/paint.c
M	source/blender/editors/sculpt_paint/paint_cursor.c
M	source/blender/gpu/intern/gpu_buffers.c

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

diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c
index c9f60356451..81c7e7f34da 100644
--- a/source/blender/blenkernel/intern/paint.c
+++ b/source/blender/blenkernel/intern/paint.c
@@ -2284,7 +2284,7 @@ void BKE_sculpt_bvh_update_from_ccg(PBVH *pbvh, SubdivCCG *subdiv_ccg)
                         subdiv_ccg->grid_hidden);
 }
 
-bool BKE_sculptsession_use_pbvh_draw(const Object *ob, const View3D *v3d)
+bool BKE_sculptsession_use_pbvh_draw(const Object *ob, const View3D *UNUSED(v3d))
 {
   SculptSession *ss = ob->sculpt;
   if (ss == NULL || ss->pbvh == NULL || ss->mode_type != OB_MODE_SCULPT) {
diff --git a/source/blender/editors/sculpt_paint/paint_cursor.c b/source/blender/editors/sculpt_paint/paint_cursor.c
index c097ddc6191..fe48485c7d5 100644
--- a/source/blender/editors/sculpt_paint/paint_cursor.c
+++ b/source/blender/editors/sculpt_paint/paint_cursor.c
@@ -38,6 +38,7 @@
 
 #include "IMB_imbuf_types.h"
 
+#include "ED_image.h"
 #include "ED_view3d.h"
 
 #include "DEG_depsgraph.h"
diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c
index 8dfc7923380..f7be2434fbf 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -109,7 +109,7 @@ typedef struct PBVHGPUFormat {
   bool active_attrs_only;
 } PBVHGPUFormat;
 
-PBVHGPUFormat *GPU_pbvh_make_format()
+PBVHGPUFormat *GPU_pbvh_make_format(void)
 {
   PBVHGPUFormat *vbo_id = MEM_callocN(sizeof(PBVHGPUFormat), "PBVHGPUFormat");



More information about the Bf-blender-cvs mailing list