kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix 31370: light falloff node linear output not working code.

Browse Source 
Fix part of thread safety issue, there's still something else wrong.
This commit is contained in:
Brecht Van Lommel 2012-05-08 19:57:56 +00:00
parent 81255ca8ce
commit d9a70ceeb1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
intern/cycles/render/nodes.cpp
View File

@ -1731,7 +1731,6 @@ void LightFalloffNode::compile(SVMCompiler& compiler)
compiler.stack_assign(out); compiler.stack_assign(out);
compiler.add_node(NODE_LIGHT_FALLOFF, NODE_LIGHT_FALLOFF_LINEAR, 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.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"); out = output("Constant");

5
intern/cycles/util/util_progress.h
View File

@ -153,8 +153,10 @@ public:
void set_update() void set_update()
{ {
if(update_cb) if(update_cb) {
thread_scoped_lock lock(update_mutex);
update_cb(); update_cb();
}
} }
void set_update_callback(boost::function<void(void)> function) void set_update_callback(boost::function<void(void)> function)
@ -164,6 +166,7 @@ public:
protected: protected:
thread_mutex progress_mutex; thread_mutex progress_mutex;
thread_mutex update_mutex;
boost::function<void(void)> update_cb; boost::function<void(void)> update_cb;
boost::function<void(void)> cancel_cb; boost::function<void(void)> cancel_cb;