[Bf-blender-cvs] [1cbf748] master: Cycles: Add assert check to shader closure merge function
Sergey Sharybin
noreply at git.blender.org
Sat Jun 13 19:08:22 CEST 2015
Commit: 1cbf748e0c8cf3711bc0cd05691794507cac098f
Author: Sergey Sharybin
Date: Sat Jun 13 18:17:16 2015 +0200
Branches: master
https://developer.blender.org/rB1cbf748e0c8cf3711bc0cd05691794507cac098f
Cycles: Add assert check to shader closure merge function
===================================================================
M intern/cycles/kernel/kernel_shader.h
===================================================================
diff --git a/intern/cycles/kernel/kernel_shader.h b/intern/cycles/kernel/kernel_shader.h
index 1d94de8..077c86f 100644
--- a/intern/cycles/kernel/kernel_shader.h
+++ b/intern/cycles/kernel/kernel_shader.h
@@ -480,6 +480,7 @@ ccl_device void shader_merge_closures(ShaderData *sd)
}
sd->num_closure--;
+ kernel_assert(sd->num_closure >= 0);
j--;
}
}
More information about the Bf-blender-cvs
mailing list