Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / physics / particle_edit_undo.c
index 5199b1c54fac1359c6a07d861a36b133093a1d00..fdf765e4557e136d0903c90e947be190a3079b50 100644 (file)
@@ -44,9 +44,9 @@
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
 #include "BLI_string.h"
 #include "BLI_utildefines.h"
 
+#include "BKE_context.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
-#include "BKE_context.h"
 #include "BKE_undo_system.h"
 
 #include "DEG_depsgraph.h"
 #include "BKE_undo_system.h"
 
 #include "DEG_depsgraph.h"
@@ -233,7 +233,7 @@ static bool particle_undosys_poll(struct bContext *C)
        ViewLayer *view_layer = CTX_data_view_layer(C);
        Object *ob = OBACT(view_layer);
        PTCacheEdit *edit = PE_get_current(scene, ob);
        ViewLayer *view_layer = CTX_data_view_layer(C);
        Object *ob = OBACT(view_layer);
        PTCacheEdit *edit = PE_get_current(scene, ob);
-       
+
        return (edit != NULL);
 }
 
        return (edit != NULL);
 }