[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46435] trunk/blender/intern/cycles: Fix 31370: light falloff node linear output not working code.

[Brecht Van Lommel]

Revision: 46435
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46435
Author:   blendix
Date:     2012-05-08 19:57:56 +0000 (Tue, 08 May 2012)
Log Message:
-----------
Fix 31370: light falloff node linear output not working code.
Fix part of thread safety issue, there's still something else wrong.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/nodes.cpp
    trunk/blender/intern/cycles/util/util_progress.h

Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp	2012-05-08 19:49:39 UTC (rev 46434)
+++ trunk/blender/intern/cycles/render/nodes.cpp	2012-05-08 19:57:56 UTC (rev 46435)
@@ -1731,7 +1731,6 @@
 		compiler.stack_assign(out);
 		compiler.add_node(NODE_LIGHT_FALLOFF, NODE_LIGHT_FALLOFF_LINEAR,
 			compiler.encode_uchar4(strength_in->stack_offset, smooth_in->stack_offset, out->stack_offset));
-		compiler.add_node(NODE_LIGHT_FALLOFF, NODE_LIGHT_FALLOFF_LINEAR, out->stack_offset);
 	}
 
 	out = output("Constant");

Modified: trunk/blender/intern/cycles/util/util_progress.h
===================================================================
--- trunk/blender/intern/cycles/util/util_progress.h	2012-05-08 19:49:39 UTC (rev 46434)
+++ trunk/blender/intern/cycles/util/util_progress.h	2012-05-08 19:57:56 UTC (rev 46435)
@@ -153,8 +153,10 @@
 
 	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 @@
 
 protected:
 	thread_mutex progress_mutex;
+	thread_mutex update_mutex;
 	boost::function<void(void)> update_cb;
 	boost::function<void(void)> cancel_cb;