diff options
| author | Jacques Lucke <jacques@blender.org> | 2020-08-04 15:39:53 +0300 |
|---|---|---|
| committer | Jacques Lucke <jacques@blender.org> | 2020-08-04 15:40:15 +0300 |
| commit | 675fa2ee132528a9d2872b278a7d9ffa98887fdb (patch) | |
| tree | 78e6e406a0bea5a1ee02c9ef86daaecd168a1689 /source/blender/modifiers/intern/MOD_mask.cc | |
| parent | 7fbbe719226cec2f5eec98bea69b5a4807df550b (diff) | |
Refactor: rename SpaceType->new to SpaceType->create
The data member `new` was conflicting with the `new` keyword
when `BKE_screen.h` was included in C++ files.
Reviewers: sergey
Differential Revision: https://developer.blender.org/D8459
Diffstat (limited to 'source/blender/modifiers/intern/MOD_mask.cc')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_mask.cc | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source/blender/modifiers/intern/MOD_mask.cc b/source/blender/modifiers/intern/MOD_mask.cc index 93fb7749392..7b09d3c470d 100644 --- a/source/blender/modifiers/intern/MOD_mask.cc +++ b/source/blender/modifiers/intern/MOD_mask.cc @@ -44,12 +44,7 @@ #include "BKE_lib_query.h" #include "BKE_mesh.h" #include "BKE_modifier.h" - -/* SpaceType struct has a member called 'new' which obviously conflicts with C++ - * so temporarily redefining the new keyword to make it compile. */ -#define new extern_new #include "BKE_screen.h" -#undef new #include "UI_interface.h" #include "UI_resources.h" |