Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 17 Mar 2019 11:54:19 +0000 (12:54 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Sun, 17 Mar 2019 11:54:19 +0000 (12:54 +0100)
1  2 
build_files/buildbot/slave_compile.py
intern/cycles/blender/blender_sync.cpp
intern/cycles/device/device.h
intern/cycles/device/device_cpu.cpp
intern/cycles/device/device_cuda.cpp
intern/cycles/render/light.cpp
intern/cycles/render/shader.cpp
tests/python/CMakeLists.txt

@@@ -60,7 -59,7 +59,6 @@@ if 'cmake' in builder
  
      # Config file to be used (relative to blender's sources root)
      cmake_config_file = "build_files/cmake/config/blender_release.cmake"
-     cmake_cuda_config_file = None
 -    cmake_player_config_file = None
  
      # Set build options.
      cmake_options = []
          target_name = 'install'
          # Tweaking CMake options to respect the target
          target_cmake_options = cmake_options[:]
-         if target == 'cuda':
-             target_cmake_options += cuda_cmake_options
-             target_chroot_prefix = cuda_chroot_prefix[:]
-             target_name = 'cycles_kernel_cuda'
-         # If cuda binaries are compiled as a separate target, make sure
-         # other targets don't compile cuda binaries.
-         if 'cuda' in targets and target != 'cuda':
-             target_cmake_options.append("-DWITH_CYCLES_CUDA_BINARIES=OFF")
 -        if target == 'player':
 -            target_cmake_options.append("-C" + os.path.join(blender_dir, cmake_player_config_file))
          # Do extra git fetch because not all platform/git/buildbot combinations
          # update the origin remote, causing buildinfo to detect local changes.
          os.chdir(blender_dir)
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -528,11 -531,11 +528,11 @@@ function(add_python_test testname tests
        endif()
  endfunction()
  
 -if(WITH_CYCLES)
 -      if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/render/ctests/shader")
 -              macro(add_cycles_render_test subject)
 +if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST_SRC_DIR}/render/ctests/shader")
 +      macro(add_cycles_render_test subject)
 +              if(WITH_CYCLES)
                        add_python_test(
-                               cycles_${subject}_test
+                               cycles_${subject}
                                ${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py
                                -blender "$<TARGET_FILE:blender>"
                                -testdir "${TEST_SRC_DIR}/render/ctests/${subject}"