Re applied patch, it appears that part of it failed:<br><br>patching file intern/cycles/render/nodes.cpp<br>patching file intern/cycles/render/nodes.h<br>patching file intern/cycles/test/test_closure/__init__.py<br>patching file intern/cycles/test/test_closure/bsdf_oren_nayar.xml<br>
patching file intern/cycles/app/cycles_xml.cpp<br>patching file intern/cycles/kernel/osl/osl_closures.cpp<br>patching file intern/cycles/kernel/osl/osl_closures.h<br>patching file intern/cycles/kernel/osl/nodes/node_oren_nayar_bsdf.osl<br>
patching file intern/cycles/kernel/osl/nodes/CMakeLists.txt<br>patching file intern/cycles/kernel/osl/nodes/stdosl.h<br>patching file intern/cycles/kernel/osl/bsdf_oren_nayar.cpp<br>patching file intern/cycles/kernel/osl/CMakeLists.txt<br>
patching file intern/cycles/kernel/svm/bsdf_oren_nayar.h<br>patching file intern/cycles/kernel/svm/svm_closure.h<br>patching file intern/cycles/kernel/svm/svm_types.h<br>patching file intern/cycles/kernel/svm/svm_bsdf.h<br>
patching file intern/cycles/kernel/CMakeLists.txt<br>patching file intern/cycles/blender/blender_shader.cpp<br>Hunk #1 succeeded at 222 (offset -4 lines).<br>patching file source/blender/blenkernel/BKE_node.h<br>Hunk #1 succeeded at 490 (offset 2 lines).<br>
patching file source/blender/blenkernel/intern/node.c<br>Hunk #1 succeeded at 1905 with fuzz 1 (offset 4 lines).<br>patching file source/blender/gpu/intern/gpu_shader_material.glsl<br>patching file source/blender/gpu/intern/gpu_shader_material.glsl.c<br>
patching file source/blender/makesrna/intern/rna_nodetree_types.h<br>Hunk #1 FAILED at 67.<br>1 out of 1 hunk FAILED -- saving rejects to file source/blender/makesrna/intern/rna_nodetree_types.h.rej<br>patching file source/blender/nodes/shader/nodes/node_shader_bsdf_oren_nayar.c<br>
patching file source/blender/nodes/NOD_shader.h<br>Hunk #1 succeeded at 80 with fuzz 1.<br>patching file source/blender/nodes/CMakeLists.txt<br>Hunk #1 succeeded at 131 with fuzz 2 (offset 3 lines).<br><br><div class="gmail_quote">
On Tue, Nov 8, 2011 at 11:03 AM, Kel M <span dir="ltr"><<a href="mailto:kelvinshrek@gmail.com">kelvinshrek@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;">
Sorry about that, tried again, not sure if it's the same error, but this time it failed at 100%:<br><br>[100%] [100%] [100%] [100%] Building CXX object intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_camera.cpp.o<br>
Building CXX object intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_object.cpp.o<br>Building CXX object intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_mesh.cpp.o<br>Building CXX object intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_python.cpp.o<br>
In file included from /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_python.cpp:21:0:<br>/home/astro/blender-cycleso/blender/intern/cycles/blender/blender_sync.h:22:30: fatal error: MEM_guardedalloc.h: No such file or directory<br>
compilation terminated.<br>make[2]: *** [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_python.cpp.o] Error 1<br>make[2]: *** Waiting for unfinished jobs....<br>In file included from /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_mesh.cpp:23:0:<br>
/home/astro/blender-cycleso/blender/intern/cycles/blender/blender_sync.h:22:30: fatal error: MEM_guardedalloc.h: No such file or directory<br>compilation terminated.<br>make[2]: *** [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_mesh.cpp.o] Error 1<br>
In file included from /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_camera.cpp:22:0:<br>/home/astro/blender-cycleso/blender/intern/cycles/blender/blender_sync.h:22:30: fatal error: MEM_guardedalloc.h: No such file or directory<br>
compilation terminated.<br>make[2]: *** [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_camera.cpp.o] Error 1<br>In file included from /home/astro/blender-cycleso/blender/intern/cycles/blender/blender_object.cpp:24:0:<br>
/home/astro/blender-cycleso/blender/intern/cycles/blender/blender_sync.h:22:30: fatal error: MEM_guardedalloc.h: No such file or directory<br>compilation terminated.<br>make[2]: *** [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_object.cpp.o] Error 1<br>
make[1]: *** [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/all] Error 2<br>make: *** [all] Error 2<div class="HOEnZb"><div class="h5"><br><br><br><div class="gmail_quote">On Tue, Nov 8, 2011 at 10:47 AM, Thomas Dinges <span dir="ltr"><<a href="mailto:blender@dingto.org" target="_blank">blender@dingto.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div text="#000000" bgcolor="#FFFFFF">
1) This patch is not finished as he said.<br>
2) Without pasting the error message here, not helpful. :) <br>
<br>
Am 08.11.2011 16:45, schrieb Kel M:
<div><div><blockquote type="cite">Your patch doesn't compile. I get error 2 at around
76%.<br>
<br>
<div class="gmail_quote">On Mon, Nov 7, 2011 at 12:18 PM, Yasuhiro
Fujii <span dir="ltr"><<a href="mailto:y-fujii@mimosa-pudica.net" target="_blank">y-fujii@mimosa-pudica.net</a>></span>
wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I've
submitted the O-N patch.<br>
<br>
<a href="http://projects.blender.org/tracker/index.php?func=detail&aid=29193&group_id=9&atid=127" target="_blank">http://projects.blender.org/tracker/index.php?func=detail&aid=29193&group_id=9&atid=127</a><br>
<br>
Sorry to bother you when you are busy with merging cycles to
trunk.<br>
<br>
-- y.fujii<br>
<br>
On Tue, Nov 8, 2011 at 12:04 AM, Brecht Van Lommel<br>
<div>
<div><<a href="mailto:brechtvanlommel@pandora.be" target="_blank">brechtvanlommel@pandora.be</a>>
wrote:<br>
> No, that's not necessary, when we actually start
supporting OSL, we<br>
> can ensure it's all in sync. For now it's ok if this
is untested.<br>
><br>
> Brecht.<br>
><br>
> On Mon, Nov 7, 2011 at 3:43 PM, Yasuhiro Fujii<br>
> <<a href="mailto:y-fujii@mimosa-pudica.net" target="_blank">y-fujii@mimosa-pudica.net</a>>
wrote:<br>
>> Thanks for reply.<br>
>> Should I wait to submit my Oren-Nayar patch until
OSL support will come back?<br>
>> Its OSL code is not tested.<br>
>><br>
>> -- y.fujii<br>
>><br>
>> On Mon, Nov 7, 2011 at 9:04 PM, Brecht Van Lommel<br>
>> <<a href="mailto:brechtvanlommel@pandora.be" target="_blank">brechtvanlommel@pandora.be</a>>
wrote:<br>
>>> It's indeed broken currently, trailing behind
the latest changes a<br>
>>> bit. I'd suggest to just keep it disabled for
building for now.<br>
>>><br>
>>> Brecht.<br>
>>><br>
>>> On Mon, Nov 7, 2011 at 6:28 AM, Yasuhiro
Fujii<br>
>>> <<a href="mailto:y-fujii@mimosa-pudica.net" target="_blank">y-fujii@mimosa-pudica.net</a>>
wrote:<br>
>>>> Building cycles with OSL is currently
broken?<br>
>>>> The error is below:<br>
>>>><br>
>>>> intern/cycles/kernel/kernel.cpp:
ccl::kernel_globals_create():<br>
>>>> "struct ccl::KernelGlobals" has no
member named "osl"<br>
>>>><br>
>>>> -- y.fujii<br>
>>>>
_______________________________________________<br>
>>>> Bf-cycles mailing list<br>
>>>> <a href="mailto:Bf-cycles@blender.org" target="_blank">Bf-cycles@blender.org</a><br>
>>>> <a href="http://lists.blender.org/mailman/listinfo/bf-cycles" target="_blank">http://lists.blender.org/mailman/listinfo/bf-cycles</a><br>
>>>><br>
>>>
_______________________________________________<br>
>>> Bf-cycles mailing list<br>
>>> <a href="mailto:Bf-cycles@blender.org" target="_blank">Bf-cycles@blender.org</a><br>
>>> <a href="http://lists.blender.org/mailman/listinfo/bf-cycles" target="_blank">http://lists.blender.org/mailman/listinfo/bf-cycles</a><br>
>>><br>
>> _______________________________________________<br>
>> Bf-cycles mailing list<br>
>> <a href="mailto:Bf-cycles@blender.org" target="_blank">Bf-cycles@blender.org</a><br>
>> <a href="http://lists.blender.org/mailman/listinfo/bf-cycles" target="_blank">http://lists.blender.org/mailman/listinfo/bf-cycles</a><br>
>><br>
> _______________________________________________<br>
> Bf-cycles mailing list<br>
> <a href="mailto:Bf-cycles@blender.org" target="_blank">Bf-cycles@blender.org</a><br>
> <a href="http://lists.blender.org/mailman/listinfo/bf-cycles" target="_blank">http://lists.blender.org/mailman/listinfo/bf-cycles</a><br>
><br>
_______________________________________________<br>
Bf-cycles mailing list<br>
<a href="mailto:Bf-cycles@blender.org" target="_blank">Bf-cycles@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/bf-cycles" target="_blank">http://lists.blender.org/mailman/listinfo/bf-cycles</a><br>
</div>
</div>
</blockquote>
</div>
<br>
<br>
<fieldset></fieldset>
<br>
<pre>_______________________________________________
Bf-cycles mailing list
<a href="mailto:Bf-cycles@blender.org" target="_blank">Bf-cycles@blender.org</a>
<a href="http://lists.blender.org/mailman/listinfo/bf-cycles" target="_blank">http://lists.blender.org/mailman/listinfo/bf-cycles</a>
</pre>
</blockquote>
<br>
<br>
</div></div><div><pre cols="72">--
Thomas Dinges
Blender Developer, Artist and Musician
<a href="http://www.dingto.org" target="_blank">www.dingto.org</a></pre>
</div></div>
<br>_______________________________________________<br>
Bf-cycles mailing list<br>
<a href="mailto:Bf-cycles@blender.org" target="_blank">Bf-cycles@blender.org</a><br>
<a href="http://lists.blender.org/mailman/listinfo/bf-cycles" target="_blank">http://lists.blender.org/mailman/listinfo/bf-cycles</a><br>
<br></blockquote></div><br>
</div></div></blockquote></div><br>