[Bf-blender-cvs] [6d3e42ccbda] blender2.8: Cleanup: Silence strict compiler warning
Sergey Sharybin
noreply at git.blender.org
Wed Sep 26 11:54:53 CEST 2018
Commit: 6d3e42ccbdaaac61f28f032e459d68b3e8d9fe33
Author: Sergey Sharybin
Date: Wed Sep 26 11:54:19 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB6d3e42ccbdaaac61f28f032e459d68b3e8d9fe33
Cleanup: Silence strict compiler warning
Was happening when using OSD for modifiers.
===================================================================
M source/blender/modifiers/intern/MOD_multires.c
M source/blender/modifiers/intern/MOD_subsurf.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c
index 826c9cbe81f..c3cfa1d8cd3 100644
--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@@ -67,6 +67,8 @@ static void initData(ModifierData *md)
mmd->quality = 3;
}
+#ifndef WITH_OPENSUBDIV_MODIFIER
+
static DerivedMesh *applyModifier_DM(
ModifierData *md, const ModifierEvalContext *ctx,
DerivedMesh *dm)
@@ -146,6 +148,8 @@ static DerivedMesh *applyModifier_DM(
applyModifier_DM_wrapper(applyModifier, applyModifier_DM)
+#endif
+
#ifdef WITH_OPENSUBDIV_MODIFIER
/* Subdivide into fully qualified mesh. */
diff --git a/source/blender/modifiers/intern/MOD_subsurf.c b/source/blender/modifiers/intern/MOD_subsurf.c
index d7c8d0c7bb6..20122eefecc 100644
--- a/source/blender/modifiers/intern/MOD_subsurf.c
+++ b/source/blender/modifiers/intern/MOD_subsurf.c
@@ -99,6 +99,8 @@ static bool isDisabled(const Scene *scene, ModifierData *md, bool useRenderParam
return get_render_subsurf_level(&scene->r, levels, useRenderParams != 0) == 0;
}
+#ifndef WITH_OPENSUBDIV_MODIFIER
+
static DerivedMesh *applyModifier_DM(
ModifierData *md, const ModifierEvalContext *ctx,
DerivedMesh *derivedData)
@@ -135,6 +137,8 @@ static DerivedMesh *applyModifier_DM(
applyModifier_DM_wrapper(applyModifier, applyModifier_DM)
+#endif
+
static DerivedMesh *applyModifierEM_DM(
ModifierData *md, const ModifierEvalContext *ctx,
struct BMEditMesh *UNUSED(editData),
More information about the Bf-blender-cvs
mailing list