Revision: 51229 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51229 Author: blendix Date: 2012-10-09 14:28:29 +0000 (Tue, 09 Oct 2012) Log Message: ----------- Fix cycles task manager calling pthread_join() twice. I haven't seen any bugs from this but best to fix anyway as it causes undefined behavior. Pointed out on irc by dslammu, thanks!
Modified Paths: -------------- trunk/blender/intern/cycles/util/util_thread.h Modified: trunk/blender/intern/cycles/util/util_thread.h =================================================================== --- trunk/blender/intern/cycles/util/util_thread.h 2012-10-09 13:36:42 UTC (rev 51228) +++ trunk/blender/intern/cycles/util/util_thread.h 2012-10-09 14:28:29 UTC (rev 51229) @@ -60,6 +60,7 @@ bool join() { + joined = true; return pthread_join(pthread_id, NULL) == 0; } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs