[Bf-blender-cvs] [426f921] alembic_basic_io: Fix for possible null pointer dereferencing.

[Kévin Dietrich]

Commit: 426f921c1b874de8fa1ffd653a20224c34f23632
Author: Kévin Dietrich
Date:   Mon Jun 20 18:38:04 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB426f921c1b874de8fa1ffd653a20224c34f23632

Fix for possible null pointer dereferencing.

===================================================================

M       source/blender/alembic/intern/abc_exporter.cc

===================================================================

diff --git a/source/blender/alembic/intern/abc_exporter.cc 
b/source/blender/alembic/intern/abc_exporter.cc
index b9ca098..e7eb0c1 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -491,10 +491,11 @@ void AbcExporter::createShapeWriter(Object *ob, Object 
*dupliObParent)
        ParticleSystem *psys = static_cast<ParticleSystem 
*>(ob->particlesystem.first);
 
        for (; psys; psys = psys->next) {
-               if (!psys_check_enabled(ob, psys))
+               if (!psys_check_enabled(ob, psys) || !psys->part) {
                        continue;
+               }
 
-               if ((psys->part->type == PART_HAIR) && enable_hair && 
psys->part) {
+               if ((psys->part->type == PART_HAIR) && enable_hair) {
                        m_settings.export_child_hairs = enable_hair_child;
                        m_shapes.push_back(new AbcHairWriter(m_scene, ob, 
xform, m_shape_sampling_index, m_settings, psys));
                }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs