[Bf-committers] Cycles branch still relevant?

[Brecht Van Lommel]

The cycles branch is already merged into trunk, there's no point in
building it anymore, new features and fixes are going to trunk now.

Brecht.

On Sat, Dec 3, 2011 at 4:53 PM, Richard Shaw <hobbes1069 at gmail.com> wrote:
> I know that cycles will be going into trunk at some point but I
> decided to go ahead and do an svn up of cycles one last time.
>
> Besides pulling in some new bundled libraries, it also appears to be
> missing several includes.
>
> I added the following after one by one after several attempts at building:
>
> Index: blender-cycles/intern/cycles/blender/CMakeLists.txt
> ===================================================================
> --- blender-cycles/intern/cycles/blender/CMakeLists.txt (revision 42362)
> +++ blender-cycles/intern/cycles/blender/CMakeLists.txt (working copy)
> @@ -28,6 +28,9 @@
>        ../kernel/svm
>        ../util
>        ../subd
> +        ../../guardedalloc
> +        ../../../source/blender/makesrna
> +        ../../../source/blender/blenloader
>        ${BLENDER_INCLUDE_DIRS}
>        ${PYTHON_INCLUDE_DIRS}
>        ${GLEW_INCLUDE_PATH})
>
> Then I ran into this error and the file does not appear to be in the
> source tree:
>
> Building CXX object
> intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_object.cpp.o
> cd /home/build/rpmbuild/blender/BUILD/blender-svn42362/Build/intern/cycles/blender
> && /usr/lib64/ccache/c++   -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
> -D_LARGEFILE64_SOURCE -D__SSE__ -D__MMX__ -D__SSE2__
> -D__LITTLE_ENDIAN__ -DBOOST_ALL_NO_LIB
> -DCCL_NAMESPACE_BEGIN="namespace ccl {" -DCCL_NAMESPACE_END=}
> -DWITH_OPENCL -DWITH_CUDA -DWITH_MULTI -DNDEBUG -Wall -Wextra
> -Wno-unused-parameter -Wno-long-long -ffast-math -msse -msse2 -msse3
> -mtune=native -O2 -DNDEBUG -I/usr/include/OpenImageIO
> -I/home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/../render
> -I/home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/../device
> -I/home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/../kernel
> -I/home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/../kernel/svm
> -I/home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/../util
> -I/home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/../subd
> -I/home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/../../guardedalloc
> -I/home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/../../../source/blender/makesrna
> -I/home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/../../../source/blender/blenloader
> -I/usr/include/python3.2mu   -o
> CMakeFiles/bf_intern_cycles.dir/blender_object.cpp.o -c
> /home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/blender_object.cpp
> In file included from
> /home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/blender_python.cpp:21:0:
> /home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/blender_sync.h:25:29:
> fatal error: RNA_blender_cpp.h: No such file or directory
> compilation terminated.
> make[2]: *** [intern/cycles/blender/CMakeFiles/bf_intern_cycles.dir/blender_python.cpp.o]
> Error 1
> make[2]: *** Waiting for unfinished jobs....
> In file included from
> /home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/blender_mesh.cpp:23:0:
> /home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/blender_sync.h:25:29:
> fatal error: RNA_blender_cpp.h: No such file or directory
> compilation terminated.
> In file included from
> /home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/blender_object.cpp:24:0:
> /home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/blender_sync.h:25:29:
> fatal error: RNA_blender_cpp.h: No such file or directory
> compilation terminated.
> In file included from
> /home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/blender_camera.cpp:22:0:
> /home/build/rpmbuild/blender/BUILD/blender-svn42362/intern/cycles/blender/blender_sync.h:25:29:
> fatal error: RNA_blender_cpp.h: No such file or directory
> compilation terminated.
>
> Should I give up on the cycles branch and wait for it to be merged?
>
> Thanks,
> Richard
> _______________________________________________
> Bf-committers mailing list
> Bf-committers at blender.org
> http://lists.blender.org/mailman/listinfo/bf-committers