From c4f99bcb6c5eca9bd43c13f86e40f5ae80dfe712 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20T=C3=B6nne?= <lukas@blender.org>
Date: Mon, 22 Jul 2024 09:52:19 +0200
Subject: [PATCH] update

---
 intern/cycles/blender/object.cpp    | 1 +
 intern/cycles/blender/particles.cpp | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/intern/cycles/blender/object.cpp b/intern/cycles/blender/object.cpp
index 54d88477bc8..a20019f8660 100644
--- a/intern/cycles/blender/object.cpp
+++ b/intern/cycles/blender/object.cpp
@@ -574,6 +574,7 @@ void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph,
   BL::ViewLayer b_view_layer = b_depsgraph.view_layer_eval();
   BL::Depsgraph::object_instances_iterator b_instance_iter;
 
+  std::cout << "Instances: " << b_depsgraph.object_instances.length() << std::endl;
   for (b_depsgraph.object_instances.begin(b_instance_iter);
        b_instance_iter != b_depsgraph.object_instances.end() && !cancel;
        ++b_instance_iter)
diff --git a/intern/cycles/blender/particles.cpp b/intern/cycles/blender/particles.cpp
index 263657af2f8..b64e81bc719 100644
--- a/intern/cycles/blender/particles.cpp
+++ b/intern/cycles/blender/particles.cpp
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: Apache-2.0 */
 
 #include "scene/particles.h"
+#include "RNA_blender_cpp.hh"
 #include "scene/mesh.h"
 #include "scene/object.h"
 
@@ -61,8 +62,12 @@ bool BlenderSync::sync_dupli_particle(BL::Object &b_ob,
 
   /* add particle */
   BL::Particle b_pa = b_psys.particles[persistent_id[0]];
-  Particle pa;
+  if (!ELEM(b_pa.alive_state(), BL::Particle::alive_state_ALIVE, BL::Particle::alive_state_DYING))
+  {
+    return false;
+  }
 
+  Particle pa;
   pa.index = persistent_id[0];
   pa.age = b_scene.frame_current_final() - b_pa.birth_time();
   pa.lifetime = b_pa.lifetime();