[Bf-blender-cvs] [b661101] cycles_bvh: Cycles: Revert unwanted debug-only change

Sergey Sharybin noreply at git.blender.org
Wed Jun 15 13:45:34 CEST 2016


Commit: b661101bb796fa5bea5c163ca11187e3160840d0
Author: Sergey Sharybin
Date:   Wed Jun 15 13:45:35 2016 +0200
Branches: cycles_bvh
https://developer.blender.org/rBb661101bb796fa5bea5c163ca11187e3160840d0

Cycles: Revert unwanted debug-only change

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

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

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

diff --git a/source/blender/blenkernel/intern/particle_distribute.c b/source/blender/blenkernel/intern/particle_distribute.c
index d774057..0d7fe04 100644
--- a/source/blender/blenkernel/intern/particle_distribute.c
+++ b/source/blender/blenkernel/intern/particle_distribute.c
@@ -1056,7 +1056,7 @@ static int psys_thread_context_init_distribute(ParticleThreadContext *ctx, Parti
 			const float pos = BLI_frand() * element_sum[totmapped - 1];
 			const int eidx = distribute_binary_search(element_sum, totmapped, pos);
 			particle_element[p] = element_map[eidx];
-			//BLI_assert(pos <= element_sum[eidx] && pos > (eidx ? element_sum[eidx - 1] : 0.0f));
+			BLI_assert(pos <= element_sum[eidx] && pos > (eidx ? element_sum[eidx - 1] : 0.0f));
 			jitter_offset[particle_element[p]] = pos;
 		}
 	}




More information about the Bf-blender-cvs mailing list