diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-15 10:59:42 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-15 11:02:53 +0300 |
commit | 3eae1bfe35fef3e28870f7688b105dfaacd11ca0 (patch) | |
tree | 3138681e7fcf7226d61ff000b333f591fff9cfc8 /source | |
parent | 5c4295ee6f92a92dbb442b1a6ffd1eb2e9adc57d (diff) |
Cleanup: quiet sign-conversion warning in OFFSETOF_STRUCT_AFTER
BLI_strict_flags.h raised a build error when this macro was used.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenlib/BLI_utildefines.h | 2 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_correctivesmooth.c | 4 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_screw.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/blenlib/BLI_utildefines.h b/source/blender/blenlib/BLI_utildefines.h index 7f9470a9111..9f68795a4a2 100644 --- a/source/blender/blenlib/BLI_utildefines.h +++ b/source/blender/blenlib/BLI_utildefines.h @@ -589,7 +589,7 @@ extern "C" { /** Performs `offsetof(typeof(data), member) + sizeof((data)->member)` for non-gcc compilers. */ #define OFFSETOF_STRUCT_AFTER(_struct, _member) \ - ((((const char *)&((_struct)->_member)) - ((const char *)(_struct))) + \ + ((size_t)(((const char *)&((_struct)->_member)) - ((const char *)(_struct))) + \ sizeof((_struct)->_member)) /** diff --git a/source/blender/modifiers/intern/MOD_correctivesmooth.c b/source/blender/modifiers/intern/MOD_correctivesmooth.c index bed88272ee6..c571a881714 100644 --- a/source/blender/modifiers/intern/MOD_correctivesmooth.c +++ b/source/blender/modifiers/intern/MOD_correctivesmooth.c @@ -52,6 +52,8 @@ #endif +#include "BLI_strict_flags.h" + static void initData(ModifierData *md) { CorrectiveSmoothModifierData *csmd = (CorrectiveSmoothModifierData *)md; @@ -63,8 +65,6 @@ static void initData(ModifierData *md) csmd->delta_cache.deltas = NULL; } -#include "BLI_strict_flags.h" - static void copyData(const ModifierData *md, ModifierData *target, const int flag) { const CorrectiveSmoothModifierData *csmd = (const CorrectiveSmoothModifierData *)md; diff --git a/source/blender/modifiers/intern/MOD_screw.c b/source/blender/modifiers/intern/MOD_screw.c index acaeb9b2777..6a46edef9a2 100644 --- a/source/blender/modifiers/intern/MOD_screw.c +++ b/source/blender/modifiers/intern/MOD_screw.c @@ -41,6 +41,8 @@ #include "MOD_modifiertypes.h" #include "MOD_ui_common.h" +#include "BLI_strict_flags.h" + static void initData(ModifierData *md) { ScrewModifierData *ltmd = (ScrewModifierData *)md; @@ -50,8 +52,6 @@ static void initData(ModifierData *md) MEMCPY_STRUCT_AFTER(ltmd, DNA_struct_default_get(ScrewModifierData), modifier); } -#include "BLI_strict_flags.h" - /** Used for gathering edge connectivity. */ typedef struct ScrewVertConnect { /** Distance from the center axis. */ |