[Bf-blender-cvs] [1e3e79fe7bf] temp_bmesh_multires: Fix one more strict flags violation
Joseph Eagar
noreply at git.blender.org
Mon May 24 05:58:35 CEST 2021
Commit: 1e3e79fe7bf90bc9aa3319c6c41cf99c70294d47
Author: Joseph Eagar
Date: Sun May 23 20:52:25 2021 -0700
Branches: temp_bmesh_multires
https://developer.blender.org/rB1e3e79fe7bf90bc9aa3319c6c41cf99c70294d47
Fix one more strict flags violation
===================================================================
M source/blender/blenkernel/intern/idprop_utils.c
M source/blender/blenlib/BLI_strict_flags.h
===================================================================
diff --git a/source/blender/blenkernel/intern/idprop_utils.c b/source/blender/blenkernel/intern/idprop_utils.c
index 433f0e97844..742510dc728 100644
--- a/source/blender/blenkernel/intern/idprop_utils.c
+++ b/source/blender/blenkernel/intern/idprop_utils.c
@@ -184,7 +184,7 @@ static void idp_repr_fn_recursive(struct ReprState *state, const IDProperty *pro
const ID *id = prop->data.pointer;
if (id != NULL) {
STR_APPEND_STR("bpy.data.");
- STR_APPEND_STR(BKE_idtype_idcode_to_name_plural(GS(id->name)));
+ STR_APPEND_STR(BKE_idtype_idcode_to_name_plural((short)GS(id->name)));
STR_APPEND_STR("[");
STR_APPEND_STR_QUOTE(id->name + 2);
STR_APPEND_STR("]");
diff --git a/source/blender/blenlib/BLI_strict_flags.h b/source/blender/blenlib/BLI_strict_flags.h
index 58755c9d9e0..dd5435e06cd 100644
--- a/source/blender/blenlib/BLI_strict_flags.h
+++ b/source/blender/blenlib/BLI_strict_flags.h
@@ -51,7 +51,6 @@
# pragma clang diagnostic error "-Wimplicit-float-conversion"
# pragma clang diagnostic error "-Wimplicit-int-conversion"
# pragma clang diagnostic error "-Wimplicit-int"
-# pragma clang diagnostic error "-Wimplicit-function-declaration"
# else
# pragma warning(error : 4018) /* signed/unsigned mismatch */
# pragma warning(error : 4244) /* conversion from 'type1' to 'type2', possible loss of data */
More information about the Bf-blender-cvs
mailing list