diff options
| author | Fabian Schempp <fabianschempp@googlemail.com> | 2022-01-31 12:53:34 +0300 |
|---|---|---|
| committer | Fabian Schempp <fabianschempp@googlemail.com> | 2022-01-31 12:53:34 +0300 |
| commit | 0eb803d801c424456e24d1031342b71111443659 (patch) | |
| tree | 3bcf918de9521b1e0e01ceb1ee3153138f8d577f /source/blender/modifiers/intern/MOD_boolean.cc | |
| parent | 472e6beeb07ddf571c8ea2767e88d39a9e13c91a (diff) | |
| parent | a727692af7fc814798efe48775d366994d600963 (diff) | |
Merge branch 'master' into soc-2021-porting-modifiers-to-nodes-decimatesoc-2021-porting-modifiers-to-nodes-decimate
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.cc')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.cc b/source/blender/modifiers/intern/MOD_boolean.cc index bb05ae3e1b3..7b084d608fb 100644 --- a/source/blender/modifiers/intern/MOD_boolean.cc +++ b/source/blender/modifiers/intern/MOD_boolean.cc @@ -641,7 +641,6 @@ ModifierTypeInfo modifierType_Boolean = { /* deformVertsEM */ nullptr, /* deformMatricesEM */ nullptr, /* modifyMesh */ modifyMesh, - /* modifyHair */ nullptr, /* modifyGeometrySet */ nullptr, /* initData */ initData, |