[Bf-blender-cvs] [0b9888d0383] functions: fix after merge

[Jacques Lucke]

Commit: 0b9888d0383709880d2c0e6343266668c1dd7af1
Author: Jacques Lucke
Date:   Mon Feb 10 14:40:04 2020 +0100
Branches: functions
https://developer.blender.org/rB0b9888d0383709880d2c0e6343266668c1dd7af1

fix after merge

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

M	source/blender/blenlib/CMakeLists.txt
M	source/blender/modifiers/intern/MOD_bparticles.c
M	source/blender/modifiers/intern/MOD_bparticles_output.c
M	source/blender/modifiers/intern/MOD_functiondeform.c
M	source/blender/modifiers/intern/MOD_functionpoints.c

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

diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index e0da79b78cf..22c5f44536d 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -261,7 +261,6 @@ set(SRC
   intern/BLI_lazy_init.cc
   BLI_math_cxx.h
   BLI_linear_allocator.h
-  BLI_optional.h
   BLI_multi_map.h
   BLI_timeit.h
   BLI_vector_adaptor.h
diff --git a/source/blender/modifiers/intern/MOD_bparticles.c b/source/blender/modifiers/intern/MOD_bparticles.c
index d76eda15ca3..0512d4ecaaa 100644
--- a/source/blender/modifiers/intern/MOD_bparticles.c
+++ b/source/blender/modifiers/intern/MOD_bparticles.c
@@ -37,7 +37,7 @@
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_scene.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 
 #include "BLI_math.h"
 
diff --git a/source/blender/modifiers/intern/MOD_bparticles_output.c b/source/blender/modifiers/intern/MOD_bparticles_output.c
index 9d52fcbb0ba..a2a056ba46e 100644
--- a/source/blender/modifiers/intern/MOD_bparticles_output.c
+++ b/source/blender/modifiers/intern/MOD_bparticles_output.c
@@ -37,7 +37,7 @@
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_scene.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 
 #include "BLI_math.h"
 
diff --git a/source/blender/modifiers/intern/MOD_functiondeform.c b/source/blender/modifiers/intern/MOD_functiondeform.c
index 3f2d4f2b102..61bf98a7076 100644
--- a/source/blender/modifiers/intern/MOD_functiondeform.c
+++ b/source/blender/modifiers/intern/MOD_functiondeform.c
@@ -37,7 +37,7 @@
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_scene.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 
 #include "BKE_global.h"
 #include "BKE_main.h"
diff --git a/source/blender/modifiers/intern/MOD_functionpoints.c b/source/blender/modifiers/intern/MOD_functionpoints.c
index aea034c137a..2362dbac585 100644
--- a/source/blender/modifiers/intern/MOD_functionpoints.c
+++ b/source/blender/modifiers/intern/MOD_functionpoints.c
@@ -37,7 +37,7 @@
 #include "BKE_mesh.h"
 #include "BKE_modifier.h"
 #include "BKE_scene.h"
-#include "BKE_library_query.h"
+#include "BKE_lib_query.h"
 
 #include "BKE_global.h"
 #include "BKE_main.h"