From d9a70ceeb14fa7e723ce226f36eba12aea2373df Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Tue, 8 May 2012 19:57:56 +0000
Subject: Fix 31370: light falloff node linear output not working code. Fix
 part of thread safety issue, there's still something else wrong.

---
 intern/cycles/util/util_progress.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'intern/cycles/util')

diff --git a/intern/cycles/util/util_progress.h b/intern/cycles/util/util_progress.h
index 2cc2995bcfe..c63aa841c52 100644
--- a/intern/cycles/util/util_progress.h
+++ b/intern/cycles/util/util_progress.h
@@ -153,8 +153,10 @@ public:
 
 	void set_update()
 	{
-		if(update_cb)
+		if(update_cb) {
+			thread_scoped_lock lock(update_mutex);
 			update_cb();
+		}
 	}
 
 	void set_update_callback(boost::function<void(void)> function)
@@ -164,6 +166,7 @@ public:
 
 protected:
 	thread_mutex progress_mutex;
+	thread_mutex update_mutex;
 	boost::function<void(void)> update_cb;
 	boost::function<void(void)> cancel_cb;
 
-- 
cgit v1.2.3