[Bf-blender-cvs] [2a4b801] particles_refactor: Fix for particle iterator validity check: also check for negative index, this is used for indicating an invalid particle iterator.

Lukas Tönne noreply at git.blender.org
Tue Apr 22 12:06:19 CEST 2014


Commit: 2a4b80101b6c070eb20ff0d2ab73ae7926011420
Author: Lukas Tönne
Date:   Fri Dec 20 16:01:31 2013 +0100
https://developer.blender.org/rB2a4b80101b6c070eb20ff0d2ab73ae7926011420

Fix for particle iterator validity check: also check for negative index,
this is used for indicating an invalid particle iterator.

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

M	source/blender/blenkernel/intern/nparticle.c

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

diff --git a/source/blender/blenkernel/intern/nparticle.c b/source/blender/blenkernel/intern/nparticle.c
index d3e33f7..579f816 100644
--- a/source/blender/blenkernel/intern/nparticle.c
+++ b/source/blender/blenkernel/intern/nparticle.c
@@ -477,7 +477,7 @@ bool BKE_nparticle_iter_valid(NParticleIterator *it)
 {
 	NParticleAttributeState *attrstate = nparticle_state_find_attribute_id(it->state);
 	if (attrstate)
-		return it->index < attrstate->data.totelem;
+		return it->index >= 0 && it->index < attrstate->data.totelem;
 	else
 		return false;
 }




More information about the Bf-blender-cvs mailing list