From 8f4ee6fb8d812ad5c6d9e5bb40f82daed16c43d0 Mon Sep 17 00:00:00 2001
From: Rodney <rodney.baker@gmail.com>
Date: Dec 30 2022 12:34:30 +0000
Subject: Merge pull request #4670 from shun-iwasawa/fix_particles_fx_column_placement_bug


Fix Particles Fx column placement bug
---

diff --git a/toonz/sources/toonzlib/scenefx.cpp b/toonz/sources/toonzlib/scenefx.cpp
index 0eb7362..5eb07dd 100644
--- a/toonz/sources/toonzlib/scenefx.cpp
+++ b/toonz/sources/toonzlib/scenefx.cpp
@@ -1018,12 +1018,13 @@ PlacedFx FxBuilder::makePF(TZeraryColumnFx *zcfx) {
   PlacedFx pf;
   pf.m_columnIndex = zcfx->getColumn()->getIndex();
 
-  // Add the column placement NaAffineFx
-  if (!getColumnPlacement(pf, m_xsh, m_frame, pf.m_columnIndex, m_isPreview))
-    return PlacedFx();
-
   // if the cell is empty, only inherits its placement
-  if (cell.isEmpty()) return pf;
+  if (cell.isEmpty()) {
+    // Add the column placement NaAffineFx
+    if (!getColumnPlacement(pf, m_xsh, m_frame, pf.m_columnIndex, m_isPreview))
+      return PlacedFx();
+    return pf;
+  }
 
   // set m_fx only when the current cell is not empty
   pf.m_fx =
@@ -1086,7 +1087,11 @@ PlacedFx FxBuilder::makePF(TZeraryColumnFx *zcfx) {
     }
   }
 
-  return pf;
+  // Add the column placement NaAffineFx
+  if (getColumnPlacement(pf, m_xsh, m_frame, pf.m_columnIndex, m_isPreview))
+    return pf;
+  else
+    return PlacedFx();
 }
 
 //-------------------------------------------------------------------