Merged changes in the trunk up to revision 52690.
[blender.git] / source / blender / render / intern / source / convertblender.c
index 6993e1baab423bdb65574d451aef10e67fae579a..f87478bb66365e53d113ad214ce9df6f0153d1d9 100644 (file)
@@ -1708,8 +1708,8 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem
                        totface= psmd->dm->getNumTessFaces(psmd->dm);
                        index_mf_to_mpoly = psmd->dm->getTessFaceDataArray(psmd->dm, CD_ORIGINDEX);
                        index_mp_to_orig = psmd->dm->getPolyDataArray(psmd->dm, CD_ORIGINDEX);
-                       if ((index_mf_to_mpoly && index_mp_to_orig) == FALSE) {
-                               index_mf_to_mpoly = index_mp_to_orig = NULL;
+                       if (index_mf_to_mpoly == NULL) {
+                               index_mp_to_orig = NULL;
                        }
                        for (a=0; a<totface; a++)
                                strandbuf->totbound = max_ii(strandbuf->totbound, (index_mf_to_mpoly) ? DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, a): a);