[Bf-blender-cvs] [e4a3186aade] functions: fix after merge

[Jacques Lucke]

Commit: e4a3186aade96118ef022b10252a409b68ea8619
Author: Jacques Lucke
Date:   Wed Feb 12 19:02:03 2020 +0100
Branches: functions
https://developer.blender.org/rBe4a3186aade96118ef022b10252a409b68ea8619

fix after merge

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

M	source/blender/blenlib/CMakeLists.txt
M	source/blender/simulations/bparticles/node_frontend.cpp

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

diff --git a/source/blender/blenlib/CMakeLists.txt b/source/blender/blenlib/CMakeLists.txt
index 7cec5046281..bdfbafb9170 100644
--- a/source/blender/blenlib/CMakeLists.txt
+++ b/source/blender/blenlib/CMakeLists.txt
@@ -265,7 +265,6 @@ set(SRC
   BLI_multi_map.h
   BLI_timeit.h
   BLI_vector_adaptor.h
-  BLI_utility_mixins.h
   BLI_static_class_ids.h
   BLI_index_mask.h
   BLI_parallel.h
diff --git a/source/blender/simulations/bparticles/node_frontend.cpp b/source/blender/simulations/bparticles/node_frontend.cpp
index ffb3ec2ddc9..59c1b057858 100644
--- a/source/blender/simulations/bparticles/node_frontend.cpp
+++ b/source/blender/simulations/bparticles/node_frontend.cpp
@@ -1,6 +1,6 @@
-#include "BKE_deform.h"
 #include "BKE_surface_hook.h"
 #include "BKE_id_data_cache.h"
+#include "BKE_deform.h"
 
 #include "DNA_mesh_types.h"
 #include "DNA_meshdata_types.h"