[Bf-blender-cvs] [820a88e37b1] temp-sculpt-colors: temp-sculpt-colors: apply warning fix patch from @dfelinto
Joseph Eagar
noreply at git.blender.org
Thu Mar 31 11:06:55 CEST 2022
Commit: 820a88e37b17a5a02f1ea42d57fe4ef7589414ed
Author: Joseph Eagar
Date: Thu Mar 31 02:05:58 2022 -0700
Branches: temp-sculpt-colors
https://developer.blender.org/rB820a88e37b17a5a02f1ea42d57fe4ef7589414ed
temp-sculpt-colors: apply warning fix patch from @dfelinto
===================================================================
M source/blender/blenkernel/intern/pbvh.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/editors/sculpt_paint/sculpt_paint_color.c
M source/blender/modifiers/intern/MOD_datatransfer.c
===================================================================
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 06a01e58e7c..ea4bb4ac4f5 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -3156,7 +3156,7 @@ void BKE_pbvh_pmap_set(PBVH *pbvh, const MeshElemMap *pmap)
pbvh->pmap = pmap;
}
-void BKE_pbvh_ensure_node_loops(PBVH *pbvh, const Mesh *me)
+void BKE_pbvh_ensure_node_loops(PBVH *pbvh, const Mesh *UNUSED(me))
{
BLI_assert(BKE_pbvh_type(pbvh) == PBVH_FACES);
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 4f05d82c04b..778411b21b4 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -664,7 +664,7 @@ static DRW_MeshCDMask mesh_cd_calc_used_gpu_layers(const Object *object,
if (name[0]) {
int layer_i = 0;
- AttributeDomain domain = ATTR_DOMAIN_POINT;
+ domain = ATTR_DOMAIN_POINT;
layer_i = CustomData_get_named_layer_index(cd_vdata, CD_PROP_COLOR, name);
layer_i = layer_i == -1 ?
CustomData_get_named_layer_index(cd_vdata, CD_MLOOPCOL, name) :
diff --git a/source/blender/editors/sculpt_paint/sculpt_paint_color.c b/source/blender/editors/sculpt_paint/sculpt_paint_color.c
index 66cb2fdca6f..c821124d947 100644
--- a/source/blender/editors/sculpt_paint/sculpt_paint_color.c
+++ b/source/blender/editors/sculpt_paint/sculpt_paint_color.c
@@ -434,7 +434,7 @@ static void do_smear_brush_task_cb_exec(void *__restrict userdata,
sub_v3_v3v3(vertex_disp, SCULPT_vertex_co_get(ss, ni.index), vd.co);
/* Weight by how close we are to our target distance from vd.co. */
- float w = (1.0f + fabsf(len_v3(vertex_disp) / ss->cache->bstrength - 1.0));
+ float w = (1.0f + fabsf(len_v3(vertex_disp) / ss->cache->bstrength - 1.0f));
/* TODO: use cotangents (or at least face areas) here. */
float len = len_v3v3(SCULPT_vertex_co_get(ss, ni.index), nco);
diff --git a/source/blender/modifiers/intern/MOD_datatransfer.c b/source/blender/modifiers/intern/MOD_datatransfer.c
index 0ce19a3c952..1f95a5a89f9 100644
--- a/source/blender/modifiers/intern/MOD_datatransfer.c
+++ b/source/blender/modifiers/intern/MOD_datatransfer.c
@@ -473,7 +473,7 @@ static void panelRegister(ARegionType *region_type)
#undef DT_TYPES_AFFECT_MESH
-static void blendRead(struct BlendDataReader *reader, struct ModifierData *md)
+static void blendRead(struct BlendDataReader *UNUSED(reader), struct ModifierData *md)
{
DataTransferModifierData *dtmd = (DataTransferModifierData *)md;
More information about the Bf-blender-cvs
mailing list