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/depsgraph/intern/depsgraph_tag.cc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'source/blender/depsgraph/intern/depsgraph_tag.cc') diff --git a/source/blender/depsgraph/intern/depsgraph_tag.cc b/source/blender/depsgraph/intern/depsgraph_tag.cc index 1863a333930..1d8fba21857 100644 --- a/source/blender/depsgraph/intern/depsgraph_tag.cc +++ b/source/blender/depsgraph/intern/depsgraph_tag.cc @@ -48,11 +48,8 @@ #include "BKE_idtype.h" #include "BKE_node.h" #include "BKE_scene.h" -#include "BKE_workspace.h" - -#define new new_ #include "BKE_screen.h" -#undef new +#include "BKE_workspace.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_debug.h" -- cgit v1.2.3