[Bf-blender-cvs] [ee11c85c068] blender2.8: CMake: make recent bad level include explicit

Campbell Barton noreply at git.blender.org
Wed Apr 18 08:24:16 CEST 2018


Commit: ee11c85c068fe5d94bf2888d3dfafb48ed945e07
Author: Campbell Barton
Date:   Wed Apr 18 08:21:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBee11c85c068fe5d94bf2888d3dfafb48ed945e07

CMake: make recent bad level include explicit

This isn't something we should do,
each instance should be noted and removed.

===================================================================

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/blenkernel/intern/particle_system.c

===================================================================

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index 6d8419208e8..4191580b0fa 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -31,7 +31,6 @@ set(INC
 	../blentranslation
 	../depsgraph
 	../draw
-	../editors/include
 	../gpu
 	../ikplugin
 	../imbuf
diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c
index edc3f2e42fd..812f8c80328 100644
--- a/source/blender/blenkernel/intern/particle_system.c
+++ b/source/blender/blenkernel/intern/particle_system.c
@@ -96,7 +96,8 @@
 
 #include "RE_shader_ext.h"
 
-#include "ED_particle.h"
+/* FIXME: BAD LEVEL CALL. */
+#include "../../editors/include/ED_particle.h"
 
 /* fluid sim particle import */
 #ifdef WITH_MOD_FLUID



More information about the Bf-blender-cvs mailing list