diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-04 14:16:56 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-04 14:18:06 +0300 |
| commit | 59562e5b259ccc1e02e4f943394ca9db5ac938c7 (patch) | |
| tree | b65e300b06c3f1ddd50bb4b7c49d9089a9447db9 /intern | |
| parent | 7db4b935e15c5fbf2810cbb222fd1ff51745a826 (diff) | |
Fix Cycles particle info node not working.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 3 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_particles.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/blender/blender_sync.h | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index be4214ede65..86c42e88e24 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -437,6 +437,9 @@ Object *BlenderSync::sync_object(BL::Depsgraph& b_depsgraph, object->dupli_generated = 0.5f*get_float3(b_dupli_iter->orco()) - make_float3(0.5f, 0.5f, 0.5f); object->dupli_uv = get_float2(b_dupli_iter->uv()); object->random_id = b_dupli_iter->random_id(); + + /* Sync possible particle data. */ + sync_dupli_particle(b_ob, *b_dupli_iter, object); } else { object->dupli_generated = make_float3(0.0f, 0.0f, 0.0f); diff --git a/intern/cycles/blender/blender_particles.cpp b/intern/cycles/blender/blender_particles.cpp index 00f8cb3cf1b..e365061722e 100644 --- a/intern/cycles/blender/blender_particles.cpp +++ b/intern/cycles/blender/blender_particles.cpp @@ -28,7 +28,7 @@ CCL_NAMESPACE_BEGIN /* Utilities */ bool BlenderSync::sync_dupli_particle(BL::Object& b_ob, - BL::DupliObject& b_dup, + BL::DepsgraphIter& b_dup, Object *object) { /* test if this dupli was generated from a particle sytem */ diff --git a/intern/cycles/blender/blender_sync.h b/intern/cycles/blender/blender_sync.h index 2ea86ba1133..80316757798 100644 --- a/intern/cycles/blender/blender_sync.h +++ b/intern/cycles/blender/blender_sync.h @@ -152,7 +152,7 @@ private: /* particles */ bool sync_dupli_particle(BL::Object& b_ob, - BL::DupliObject& b_dup, + BL::DepsgraphIter& b_dup, Object *object); /* Images. */ |