diff options
author | Campbell Barton <campbell@blender.org> | 2022-06-09 02:48:37 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-06-09 02:48:37 +0300 |
commit | 530f2abb9b0f2886925ac7bd8d0583e44eebb793 (patch) | |
tree | acf745161afd4c4d922a767cd2f9a631c0b511d6 /source | |
parent | 4ff9c0f4e3e3c3ce958619643fbdce175a2b6723 (diff) |
Cleanup: quiet warnings
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/draw/DRW_engine.h | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_cache.c | 4 | ||||
-rw-r--r-- | source/blender/gpu/GPU_buffers.h | 2 | ||||
-rw-r--r-- | source/blender/gpu/intern/gpu_buffers.c | 10 |
4 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h index 5b3d262ac66..dec7a22aadb 100644 --- a/source/blender/draw/DRW_engine.h +++ b/source/blender/draw/DRW_engine.h @@ -222,7 +222,7 @@ void DRW_opengl_context_activate(bool drw_state); void DRW_draw_cursor_2d_ex(const struct ARegion *region, const float cursor[2]); void DRW_cdlayer_attr_aliases_add(struct GPUVertFormat *format, - char *base_name, + const char *base_name, const struct CustomData *data, const struct CustomDataLayer *cl, bool is_active_render, diff --git a/source/blender/draw/intern/draw_cache.c b/source/blender/draw/intern/draw_cache.c index dc4e34c64cb..f846251c66b 100644 --- a/source/blender/draw/intern/draw_cache.c +++ b/source/blender/draw/intern/draw_cache.c @@ -3412,8 +3412,8 @@ void DRW_batch_cache_free_old(Object *ob, int ctime) /** \} */ void DRW_cdlayer_attr_aliases_add(GPUVertFormat *format, - char *base_name, - const CustomData *data, + const char *base_name, + const CustomData *UNUSED(data), const CustomDataLayer *cl, bool is_active_render, bool is_active_layer) diff --git a/source/blender/gpu/GPU_buffers.h b/source/blender/gpu/GPU_buffers.h index 5d33ea71fe7..1fe3b363687 100644 --- a/source/blender/gpu/GPU_buffers.h +++ b/source/blender/gpu/GPU_buffers.h @@ -151,7 +151,7 @@ struct GPUBatch *GPU_pbvh_buffers_batch_get(GPU_PBVH_Buffers *buffers, bool fast short GPU_pbvh_buffers_material_index_get(GPU_PBVH_Buffers *buffers); bool GPU_pbvh_buffers_has_overlays(GPU_PBVH_Buffers *buffers); -PBVHGPUFormat *GPU_pbvh_make_format(); +PBVHGPUFormat *GPU_pbvh_make_format(void); void GPU_pbvh_free_format(PBVHGPUFormat *vbo_id); #ifdef __cplusplus diff --git a/source/blender/gpu/intern/gpu_buffers.c b/source/blender/gpu/intern/gpu_buffers.c index 6c6c751a6cc..8dfc7923380 100644 --- a/source/blender/gpu/intern/gpu_buffers.c +++ b/source/blender/gpu/intern/gpu_buffers.c @@ -1206,17 +1206,17 @@ static int gpu_pbvh_make_attr_offs(eAttrDomainMask domain_mask, const CustomDataLayer *active_layer, const CustomDataLayer *render_layer) { - const CustomData *cdata = active_domain == ATTR_DOMAIN_POINT ? vdata : ldata; + const CustomData *cdata_active = active_domain == ATTR_DOMAIN_POINT ? vdata : ldata; - if (!cdata) { + if (!cdata_active) { return 0; } if (active_only) { - int idx = active_layer ? active_layer - cdata->layers : -1; + int idx = active_layer ? active_layer - cdata_active->layers : -1; - if (idx >= 0 && idx < cdata->totlayer) { - r_cd_attrs[0].cd_offset = cdata->layers[idx].offset; + if (idx >= 0 && idx < cdata_active->totlayer) { + r_cd_attrs[0].cd_offset = cdata_active->layers[idx].offset; r_cd_attrs[0].domain = active_domain; r_cd_attrs[0].type = active_type; r_cd_attrs[0].layer_idx = idx; |