From f171d0f29c1394795c0a1dea2cb5118859e9ccdc Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Fri, 9 Nov 2012 03:10:22 +0000 Subject: Fix #33125: cycles OSL crash with multiple render sessions running at the same time. --- intern/cycles/kernel/osl/osl_globals.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'intern/cycles/kernel/osl/osl_globals.h') diff --git a/intern/cycles/kernel/osl/osl_globals.h b/intern/cycles/kernel/osl/osl_globals.h index 5d557ffcb07..80ced9dfd62 100644 --- a/intern/cycles/kernel/osl/osl_globals.h +++ b/intern/cycles/kernel/osl/osl_globals.h @@ -68,6 +68,11 @@ struct OSLGlobals { }; static tls_ptr(ThreadData, thread_data); + static thread_mutex thread_data_mutex; + static volatile int thread_data_users; + + void thread_data_init(); + void thread_data_free(); }; CCL_NAMESPACE_END -- cgit v1.2.3