diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2021-04-29 20:17:22 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2021-04-29 20:17:22 +0300 |
| commit | f70a8c158118b422d4937d3e028b049d5efe9148 (patch) | |
| tree | 6b6e20139565f50713c3ef69b7ee16f329b1de50 /source/blender/modifiers/intern/MOD_bevel.c | |
| parent | 8eeacca9cbc1e82b8cd869ae43e44fec2d4492c9 (diff) | |
| parent | 9291128bff9aafcf7ddc5765e9c89c9655e21c4b (diff) | |
Merge branch 'master' into temp_bmesh_multires
Also fixed a pose brush bug that may or may not have been
the result of the merge nixing code, need to check master.
Diffstat (limited to 'source/blender/modifiers/intern/MOD_bevel.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_bevel.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_bevel.c b/source/blender/modifiers/intern/MOD_bevel.c index 3a4287ce35a..d32ef212ab3 100644 --- a/source/blender/modifiers/intern/MOD_bevel.c +++ b/source/blender/modifiers/intern/MOD_bevel.c @@ -448,7 +448,6 @@ ModifierTypeInfo modifierType_Bevel = { /* modifyMesh */ modifyMesh, /* modifyHair */ NULL, /* modifyGeometrySet */ NULL, - /* modifyVolume */ NULL, /* initData */ initData, /* requiredDataMask */ requiredDataMask, /* freeData */ freeData, |