Hi Brecht, thanks for your work! I get an cmake error after update, maybe a missing file.
CMake Error at build_files/cmake/macros.cmake:126 (add_library): Cannot find source file: shader/nodes/node_shader_attribute.c Best regards, Thomas Am 17.09.2011 15:28, schrieb Brecht Van Lommel: > Revision: 40298 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40298 > Author: blendix > Date: 2011-09-17 13:28:40 +0000 (Sat, 17 Sep 2011) > Log Message: > ----------- > Cycles: svn merge -r39870:r40266 > https://svn.blender.org/svnroot/bf-blender/trunk/blender > > Merging the node changes required a lot of conflict resolution, fixed the > issues I could find but if you want stability you might want to wait a bit > before updating. > > Revision Links: > -------------- > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39870 > > http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40266 -- Thomas Dinges Blender Developer, Artist and Musician www.dingto.org _______________________________________________ Bf-committers mailing list Bf-committers@blender.org http://lists.blender.org/mailman/listinfo/bf-committers