Merge branch 'master' into blender2.8
[blender.git] / source / blender / makesrna / intern / rna_sculpt_paint.c
index be52a3f..b89b218 100644 (file)
@@ -40,8 +40,9 @@
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 
-#include "BKE_paint.h"
+#include "BKE_main.h"
 #include "BKE_material.h"
+#include "BKE_paint.h"
 
 #include "ED_image.h"
 
@@ -104,9 +105,9 @@ const EnumPropertyItem rna_enum_symmetrize_direction_items[] = {
 
 #include "BKE_context.h"
 #include "BKE_DerivedMesh.h"
-#include "BKE_pointcache.h"
 #include "BKE_particle.h"
 #include "BKE_pbvh.h"
+#include "BKE_pointcache.h"
 #include "BKE_object.h"
 
 #include "DEG_depsgraph.h"