diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-24 14:14:59 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-01-24 14:14:59 +0300 |
| commit | 6a65fc34565da167d686d0ea14f11f73f909d19d (patch) | |
| tree | 22b2cbcc614278faa1d3847aafb4371453b2dcf9 /source/blender/modifiers/intern/MOD_wireframe.c | |
| parent | 752fc35fa15b6bfee0309354ffcbf5c78211e8a6 (diff) | |
| parent | e68771fa8760035050f476895ebe791c4857f91b (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/modifiers/intern/MOD_wireframe.c
Diffstat (limited to 'source/blender/modifiers/intern/MOD_wireframe.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_wireframe.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/source/blender/modifiers/intern/MOD_wireframe.c b/source/blender/modifiers/intern/MOD_wireframe.c index 6fc1907ba0a..3cb35286114 100644 --- a/source/blender/modifiers/intern/MOD_wireframe.c +++ b/source/blender/modifiers/intern/MOD_wireframe.c @@ -52,11 +52,6 @@ static void copyData(ModifierData *md, ModifierData *target) modifier_copyData_generic(md, target); } -static bool isDisabled(ModifierData *UNUSED(md), int UNUSED(useRenderParams)) -{ - return false; -} - static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) { WireframeModifierData *wmd = (WireframeModifierData *)md; @@ -132,8 +127,8 @@ ModifierTypeInfo modifierType_Wireframe = { /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ NULL, - /* isDisabled */ isDisabled, - /* updateDepsgraph */ NULL, + /* isDisabled */ NULL, + /* updateDepgraph */ NULL, /* dependsOnTime */ NULL, /* dependsOnNormals */ dependsOnNormals, /* foreachObjectLink */ NULL, |