1 files changed, 14 insertions, 6 deletions

diff --git a/source/blender/editors/transform/transform_convert_particle.c b/source/blender/editors/transform/transform_convert_particle.c
index d7b0f378c8a..354402a305f 100644
--- a/source/blender/editors/transform/transform_convert_particle.c
+++ b/source/blender/editors/transform/transform_convert_particle.c
@@ -13,6 +13,7 @@
 #include "BLI_math.h"
 
 #include "BKE_context.h"
+#include "BKE_layer.h"
 #include "BKE_particle.h"
 #include "BKE_pointcache.h"
 
@@ -28,13 +29,13 @@
 /** \name Particle Edit Transform Creation
  * \{ */
 
-void createTransParticleVerts(TransInfo *t)
+static void createTransParticleVerts(bContext *UNUSED(C), TransInfo *t)
 {
   FOREACH_TRANS_DATA_CONTAINER (t, tc) {
 
     TransData *td = NULL;
     TransDataExtension *tx;
-    Object *ob = OBACT(t->view_layer);
+    Object *ob = BKE_view_layer_active_object_get(t->view_layer);
     ParticleEditSettings *pset = PE_settings(t->scene);
     PTCacheEdit *edit = PE_get_current(t->depsgraph, t->scene, ob);
     ParticleSystem *psys = NULL;
@@ -183,7 +184,7 @@ static void flushTransParticles(TransInfo *t)
   FOREACH_TRANS_DATA_CONTAINER (t, tc) {
     Scene *scene = t->scene;
     ViewLayer *view_layer = t->view_layer;
-    Object *ob = OBACT(view_layer);
+    Object *ob = BKE_view_layer_active_object_get(view_layer);
     PTCacheEdit *edit = PE_get_current(t->depsgraph, scene, ob);
     ParticleSystem *psys = edit->psys;
     PTCacheEditPoint *point;
@@ -223,7 +224,7 @@ static void flushTransParticles(TransInfo *t)
       }
     }
 
-    PE_update_object(t->depsgraph, scene, OBACT(view_layer), 1);
+    PE_update_object(t->depsgraph, scene, BKE_view_layer_active_object_get(view_layer), 1);
     BKE_particle_batch_cache_dirty_tag(psys, BKE_PARTICLE_BATCH_DIRTY_ALL);
     DEG_id_tag_update(&ob->id, ID_RECALC_PSYS_REDO);
   }
@@ -235,12 +236,19 @@ static void flushTransParticles(TransInfo *t)
 /** \name Recalc Transform Particles Data
  * \{ */
 
-void recalcData_particles(TransInfo *t)
+static void recalcData_particles(TransInfo *t)
 {
   if (t->state != TRANS_CANCEL) {
-    applyProject(t);
+    applySnappingIndividual(t);
   }
   flushTransParticles(t);
 }
 
 /** \} */
+
+TransConvertTypeInfo TransConvertType_Particle = {
+    /* flags */ T_POINTS,
+    /* createTransData */ createTransParticleVerts,
+    /* recalcData */ recalcData_particles,
+    /* special_aftertrans_update */ NULL,
+};