Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 11 Feb 2019 17:39:31 +0000 (18:39 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Mon, 11 Feb 2019 17:39:31 +0000 (18:39 +0100)
1  2 
intern/cycles/blender/addon/operators.py
tests/python/CMakeLists.txt
tests/python/cycles_render_tests.py

@@@ -49,9 -49,9 +49,9 @@@ class CYCLES_OT_denoise_animation(Opera
      bl_idname = "cycles.denoise_animation"
      bl_label = "Denoise Animation"
  
 -    input_filepath = StringProperty(
 +    input_filepath: StringProperty(
          name='Input Filepath',
-         description='File path for frames to denoise. If not specified, uses the render file path from the scene',
+         description='File path for image to denoise. If not specified, uses the render file path and frame range from the scene',
          default='',
          subtype='FILE_PATH')
  
@@@ -539,39 -542,32 +539,40 @@@ if(OPENIMAGEIO_IDIFF AND EXISTS "${TEST
                                -idiff "${OPENIMAGEIO_IDIFF}"
                                -outdir "${TEST_OUT_DIR}/cycles"
                        )
 -              endmacro()
 -              if(WITH_OPENGL_RENDER_TESTS)
 -                      add_cycles_render_test(opengl)
                endif()
 -              add_cycles_render_test(bake)
 -              add_cycles_render_test(bsdf)
 -              add_cycles_render_test(denoise)
 -              add_cycles_render_test(denoise_animation)
 -              add_cycles_render_test(displacement)
 -              add_cycles_render_test(hair)
 -              add_cycles_render_test(image_data_types)
 -              add_cycles_render_test(image_mapping)
 -              add_cycles_render_test(image_texture_limit)
 -              add_cycles_render_test(integrator)
 -              add_cycles_render_test(light)
 -              add_cycles_render_test(mesh)
 -              add_cycles_render_test(motion_blur)
 -              add_cycles_render_test(render_layer)
 -              add_cycles_render_test(reports)
 -              add_cycles_render_test(shader)
 -              add_cycles_render_test(shadow_catcher)
 -              add_cycles_render_test(sss)
 -              add_cycles_render_test(volume)
 -      else()
 -              MESSAGE(STATUS "Disabling Cycles tests because tests folder does not exist")
 -      endif()
 +
 +              if(WITH_OPENGL_RENDER_TESTS AND (NOT ${subject} MATCHES "bake"))
 +                      add_python_test(
 +                              eevee_${subject}_test
 +                              ${CMAKE_CURRENT_LIST_DIR}/eevee_render_tests.py
 +                              -blender "$<TARGET_FILE:blender>"
 +                              -testdir "${TEST_SRC_DIR}/render/ctests/${subject}"
 +                              -idiff "${OPENIMAGEIO_IDIFF}"
 +                              -outdir "${TEST_OUT_DIR}/eevee"
 +                      )
 +              endif()
 +      endmacro()
 +      add_cycles_render_test(bake)
 +      add_cycles_render_test(bsdf)
 +      add_cycles_render_test(denoise)
++      add_cycles_render_test(denoise_animation)
 +      add_cycles_render_test(displacement)
 +      add_cycles_render_test(hair)
 +      add_cycles_render_test(image_data_types)
 +      add_cycles_render_test(image_mapping)
 +      add_cycles_render_test(image_texture_limit)
 +      add_cycles_render_test(integrator)
 +      add_cycles_render_test(light)
 +      add_cycles_render_test(mesh)
 +      add_cycles_render_test(motion_blur)
 +      add_cycles_render_test(render_layer)
 +      add_cycles_render_test(reports)
 +      add_cycles_render_test(shader)
 +      add_cycles_render_test(shadow_catcher)
 +      add_cycles_render_test(sss)
 +      add_cycles_render_test(volume)
 +elseif(WITH_CYCLES)
 +      MESSAGE(STATUS "Disabling Cycles tests because tests folder does not exist")
  endif()
  
  if(WITH_OPENGL_DRAW_TESTS)
Simple merge