From 675fa2ee132528a9d2872b278a7d9ffa98887fdb Mon Sep 17 00:00:00 2001 From: Jacques Lucke Date: Tue, 4 Aug 2020 14:39:53 +0200 Subject: 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 --- source/blender/modifiers/intern/MOD_simulation.cc | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source/blender/modifiers/intern/MOD_simulation.cc') diff --git a/source/blender/modifiers/intern/MOD_simulation.cc b/source/blender/modifiers/intern/MOD_simulation.cc index edfcc16af85..92ad02ae34a 100644 --- a/source/blender/modifiers/intern/MOD_simulation.cc +++ b/source/blender/modifiers/intern/MOD_simulation.cc @@ -46,16 +46,11 @@ #include "BKE_mesh.h" #include "BKE_modifier.h" #include "BKE_pointcloud.h" +#include "BKE_screen.h" #include "BKE_simulation.h" #include "BLO_read_write.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" -- cgit v1.2.3