2011-01-21 00:06:30 +00:00
|
|
|
# ***** BEGIN GPL LICENSE BLOCK *****
|
|
|
|
#
|
|
|
|
# This program is free software; you can redistribute it and/or
|
|
|
|
# modify it under the terms of the GNU General Public License
|
|
|
|
# as published by the Free Software Foundation; either version 2
|
|
|
|
# of the License, or (at your option) any later version.
|
|
|
|
#
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
# GNU General Public License for more details.
|
|
|
|
#
|
|
|
|
# You should have received a copy of the GNU General Public License
|
|
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
|
|
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
|
|
# ***** END GPL LICENSE BLOCK *****
|
|
|
|
|
|
|
|
# Use '--write-blend=/tmp/test.blend' to view output
|
|
|
|
|
2014-03-26 20:30:22 +00:00
|
|
|
# Some tests are interesting but take too long to run
|
|
|
|
# and don't give deterministic results
|
|
|
|
set(USE_EXPERIMENTAL_TESTS FALSE)
|
2011-01-21 00:06:30 +00:00
|
|
|
|
|
|
|
set(TEST_SRC_DIR ${CMAKE_SOURCE_DIR}/../lib/tests)
|
|
|
|
set(TEST_OUT_DIR ${CMAKE_BINARY_DIR}/tests)
|
|
|
|
|
2011-03-16 12:06:12 +00:00
|
|
|
# ugh, any better way to do this on testing only?
|
2019-06-25 17:52:37 +00:00
|
|
|
file(MAKE_DIRECTORY ${TEST_OUT_DIR})
|
|
|
|
file(MAKE_DIRECTORY ${TEST_OUT_DIR}/io_tests)
|
2011-03-16 12:06:12 +00:00
|
|
|
|
2019-04-17 04:35:54 +00:00
|
|
|
#~ if(NOT IS_DIRECTORY ${TEST_SRC_DIR})
|
|
|
|
#~ message(FATAL_ERROR "CMake test directory not found!")
|
|
|
|
#~ endif()
|
2011-01-21 00:06:30 +00:00
|
|
|
|
|
|
|
# all calls to blender use this
|
2019-05-10 11:29:43 +00:00
|
|
|
# --env-system-scripts allows to run without the install target, but does
|
|
|
|
# not work for all configurations.
|
|
|
|
if(WITH_CYCLES OR (APPLE AND (${CMAKE_GENERATOR} MATCHES "Xcode")))
|
|
|
|
set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup)
|
2011-03-13 13:09:18 +00:00
|
|
|
else()
|
2019-04-17 04:35:54 +00:00
|
|
|
set(TEST_BLENDER_EXE_PARAMS --background -noaudio --factory-startup --env-system-scripts ${CMAKE_SOURCE_DIR}/release/scripts)
|
2011-03-13 13:09:18 +00:00
|
|
|
endif()
|
2011-01-21 00:06:30 +00:00
|
|
|
|
2017-04-21 14:20:35 +00:00
|
|
|
# for testing with valgrind prefix: valgrind --track-origins=yes --error-limit=no
|
2017-08-03 22:11:42 +00:00
|
|
|
# set(TEST_BLENDER_EXE_BARE ${TEST_BLENDER_EXE})
|
|
|
|
# set(TEST_BLENDER_EXE ${TEST_BLENDER_EXE} ${TEST_BLENDER_EXE_PARAMS} )
|
2011-01-21 00:06:30 +00:00
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
# Run Blender command with parameters.
|
|
|
|
function(add_blender_test name)
|
|
|
|
add_test(
|
|
|
|
NAME ${name}
|
|
|
|
COMMAND "$<TARGET_FILE:blender>" ${TEST_BLENDER_EXE_PARAMS} ${ARGN}
|
|
|
|
)
|
|
|
|
endfunction()
|
|
|
|
|
|
|
|
# Run Python script outside Blender.
|
|
|
|
function(add_python_test testname testscript)
|
|
|
|
if(MSVC)
|
|
|
|
add_blender_test(
|
|
|
|
${testname}
|
|
|
|
"$<TARGET_FILE_DIR:blender>/${BLENDER_VERSION_MAJOR}.${BLENDER_VERSION_MINOR}/python/bin/python$<$<CONFIG:Debug>:_d>"
|
|
|
|
${testscript} ${ARGN}
|
|
|
|
)
|
|
|
|
else()
|
|
|
|
add_blender_test(
|
|
|
|
${testname}
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
endfunction()
|
2011-03-18 23:58:13 +00:00
|
|
|
|
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# GENERAL PYTHON CORRECTNESS TESTS
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_load_keymap
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_keymap_completeness.py
|
2013-02-26 04:48:16 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_load_addons
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_load_addons.py
|
2011-03-18 23:58:13 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_load_modules
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_load_py_modules.py
|
2011-03-18 23:58:13 +00:00
|
|
|
)
|
|
|
|
|
2011-03-22 14:09:07 +00:00
|
|
|
# test running operators doesn't segfault under various conditions
|
2014-03-26 20:30:22 +00:00
|
|
|
if(USE_EXPERIMENTAL_TESTS)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_run_operators
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_run_operators.py
|
|
|
|
)
|
2014-03-26 20:30:22 +00:00
|
|
|
endif()
|
2011-03-22 14:09:07 +00:00
|
|
|
|
2015-09-24 10:49:44 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# PY API TESTS
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_pyapi_bpy_path
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_bpy_path.py
|
2015-09-24 10:49:44 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_pyapi_bpy_utils_units
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_bpy_utils_units.py
|
2015-09-24 10:49:44 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_pyapi_mathutils
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_mathutils.py
|
2011-12-20 01:49:24 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_pyapi_idprop
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_idprop.py
|
2017-03-18 16:37:22 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_pyapi_idprop_datablock
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_pyapi_idprop_datablock.py
|
Datablock ID Properties
The absence of datablock properties "will certainly be resolved soon as the need for them is becoming obvious" said the [[http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.67/Python_Nodes|Python Nodes release notes]]. So this patch allows Python scripts to create ID Properties which reference datablocks.
This functionality is implemented for `PointerProperty` and now such properties can be created with Python.
In addition to the standard update callback, `PointerProperty` can have a `poll` callback (standard RNA) which is useful for search menus. For details see the test included in this patch.
Original author: @artfunkel
Alexander (Blend4Web Team)
Reviewers: brecht, artfunkel, mont29, campbellbarton
Reviewed By: mont29, campbellbarton
Subscribers: jta, sergey, campbellbarton, wisaac, poseidon4o, mont29, homyachetser, Evgeny_Rodygin, AlexKowel, yurikovelenov, fjuhec, sharlybg, cardboard, duarteframos, blueprintrandom, a.romanov, BYOB, disnel, aditiapratama, bliblubli, dfelinto, lukastoenne
Maniphest Tasks: T37754
Differential Revision: https://developer.blender.org/D113
2017-04-13 09:30:03 +00:00
|
|
|
)
|
|
|
|
|
2014-02-02 18:29:08 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# MODELING TESTS
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
bmesh_bevel
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/modeling/bevel_regression.blend
|
|
|
|
--python-text run_tests
|
2014-02-02 18:29:08 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
bmesh_boolean
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/modeling/bool_regression.blend
|
|
|
|
--python-text run_tests
|
2018-02-12 12:23:23 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
bmesh_split_faces
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/modeling/split_faces_test.blend
|
|
|
|
--python-text run_tests
|
2017-02-16 14:36:00 +00:00
|
|
|
)
|
|
|
|
|
2017-05-26 19:57:45 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# MODIFIERS TESTS
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
object_modifier_array
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/modifier_stack/array_test.blend
|
2019-07-31 16:29:58 +00:00
|
|
|
--python-text run_tests.py
|
2017-05-26 19:57:45 +00:00
|
|
|
)
|
|
|
|
|
2011-03-18 23:58:13 +00:00
|
|
|
# ------------------------------------------------------------------------------
|
|
|
|
# IO TESTS
|
|
|
|
|
2011-01-21 00:06:30 +00:00
|
|
|
# OBJ Import tests
|
2015-02-10 14:29:18 +00:00
|
|
|
# disabled until updated & working
|
|
|
|
if(FALSE)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_obj_cube
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_scene.obj\(filepath='${TEST_SRC_DIR}/io_tests/obj/cube.obj'\)
|
|
|
|
--md5=39cce4bacac2d1b18fc470380279bc15 --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_obj_cube.blend
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_obj_nurbs_cyclic
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_scene.obj\(filepath='${TEST_SRC_DIR}/io_tests/obj/nurbs_cyclic.obj'\)
|
|
|
|
--md5=ad3c307e5883224a0492378cd32691ab --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_obj_nurbs_cyclic.blend
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_obj_makehuman
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_scene.obj\(filepath='${TEST_SRC_DIR}/io_tests/obj/makehuman.obj'\)
|
|
|
|
--md5=c9f78b185e58358daa4ecaecfa75464e --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_obj_makehuman.blend
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
2015-02-10 14:29:18 +00:00
|
|
|
endif()
|
2011-01-21 00:06:30 +00:00
|
|
|
|
|
|
|
# OBJ Export tests
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_obj_cube
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/all_quads.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.obj\(filepath='${TEST_OUT_DIR}/io_tests/export_obj_cube.obj',use_selection=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_obj_cube.obj
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_obj_cube.mtl
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=95832f81160f07101dc566cb286a9f76 --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_obj_nurbs
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/nurbs.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.obj\(filepath='${TEST_OUT_DIR}/io_tests/export_obj_nurbs.obj',use_selection=False,use_nurbs=True\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_obj_nurbs.obj
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_obj_nurbs.mtl
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=a733ae4fa4a591ea9b0912da3af042de --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2015-02-10 14:29:18 +00:00
|
|
|
# disabled until updated & working
|
|
|
|
if(FALSE)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_obj_all_objects
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_scene/all_objects.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.obj\(filepath='${TEST_OUT_DIR}/io_tests/export_obj_all_objects.obj',use_selection=False,use_nurbs=True\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_obj_all_objects.obj
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_obj_all_objects.mtl
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=04b3ed97cede07a19548fc518ce9f8ca --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
2015-02-10 14:29:18 +00:00
|
|
|
endif()
|
2011-01-21 00:06:30 +00:00
|
|
|
|
2011-01-21 10:49:39 +00:00
|
|
|
|
|
|
|
|
|
|
|
# PLY Import tests
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_ply_cube
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_mesh.ply\(filepath='${TEST_SRC_DIR}/io_tests/ply/cube_ascii.ply'\)
|
|
|
|
--md5=527134343c27fc0ea73115b85fbfd3ac --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_ply_cube.blend
|
2011-01-21 10:49:39 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_ply_bunny
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_mesh.ply\(filepath='${TEST_SRC_DIR}/io_tests/ply/bunny2.ply'\)
|
|
|
|
--md5=6ea5b8533400a17accf928b8fd024eaa --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_ply_bunny.blend
|
2011-01-21 10:49:39 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_ply_small_holes
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_mesh.ply\(filepath='${TEST_SRC_DIR}/io_tests/ply/many_small_holes.ply'\)
|
|
|
|
--md5=c3093e26ecae5b6d59fbbcf2a0d0b39f --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_ply_small_holes.blend
|
2011-01-21 10:49:39 +00:00
|
|
|
)
|
|
|
|
|
2011-10-10 00:29:23 +00:00
|
|
|
# PLY Export
|
2015-02-10 14:29:18 +00:00
|
|
|
# disabled until updated & working
|
|
|
|
if(FALSE)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_ply_cube_all_data
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/cube_all_data.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_mesh.ply\(filepath='${TEST_OUT_DIR}/io_tests/export_ply_cube_all_data.ply'\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_ply_cube_all_data.ply
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=6adc3748ceae8298496f99d0e7e76c15 --md5_method=FILE
|
2011-10-10 00:29:23 +00:00
|
|
|
)
|
2011-01-21 10:49:39 +00:00
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_ply_suzanne_all_data
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/suzanne_all_data.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_mesh.ply\(filepath='${TEST_OUT_DIR}/io_tests/export_ply_suzanne_all_data.ply'\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_ply_suzanne_all_data.ply
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=68ba23f02efd6511bfd093f45f703221 --md5_method=FILE
|
2011-10-10 00:29:23 +00:00
|
|
|
)
|
2015-02-10 14:29:18 +00:00
|
|
|
endif()
|
2011-10-10 00:29:23 +00:00
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_ply_vertices # lame, add a better one
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/vertices.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_mesh.ply\(filepath='${TEST_OUT_DIR}/io_tests/export_ply_vertices.ply'\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_ply_vertices.ply
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=37faba0aa2014451b27f951afa92f870 --md5_method=FILE
|
2011-10-10 00:29:23 +00:00
|
|
|
)
|
2011-01-21 10:49:39 +00:00
|
|
|
|
|
|
|
|
|
|
|
# STL Import tests
|
2015-02-10 14:29:18 +00:00
|
|
|
# disabled until updated & working
|
|
|
|
if(FALSE)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_stl_cube
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_mesh.stl\(filepath='${TEST_SRC_DIR}/io_tests/stl/cube.stl'\)
|
|
|
|
--md5=8ceb5bb7e1cb5f4342fa1669988c66b4 --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_stl_cube.blend
|
2011-01-21 10:49:39 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_stl_conrod
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_mesh.stl\(filepath='${TEST_SRC_DIR}/io_tests/stl/conrod.stl'\)
|
|
|
|
--md5=690a4b8eb9002dcd8631c5a575ea7348 --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_stl_conrod.blend
|
2011-01-21 10:49:39 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_stl_knot_max_simplified
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_mesh.stl\(filepath='${TEST_SRC_DIR}/io_tests/stl/knot_max_simplified.stl'\)
|
|
|
|
--md5=baf82803f45a84ec4ddbad9cef57dd3e --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_stl_knot_max_simplified.blend
|
2011-01-21 10:49:39 +00:00
|
|
|
)
|
2015-02-10 14:29:18 +00:00
|
|
|
endif()
|
2011-01-21 10:49:39 +00:00
|
|
|
|
2011-10-10 00:29:23 +00:00
|
|
|
# STL Export
|
2015-02-10 14:29:18 +00:00
|
|
|
# disabled until updated & working
|
|
|
|
if(FALSE)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_stl_cube_all_data
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/cube_all_data.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_mesh.stl\(filepath='${TEST_OUT_DIR}/io_tests/export_stl_cube_all_data.stl'\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_stl_cube_all_data.stl
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=64cb97c0cabb015e1c3f76369835075a --md5_method=FILE
|
2011-10-10 00:29:23 +00:00
|
|
|
)
|
2011-01-21 10:49:39 +00:00
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_stl_suzanne_all_data
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/suzanne_all_data.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_mesh.stl\(filepath='${TEST_OUT_DIR}/io_tests/export_stl_suzanne_all_data.stl'\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_stl_suzanne_all_data.stl
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=e9b23c97c139ad64961c635105bb9192 --md5_method=FILE
|
2011-10-10 00:29:23 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_stl_vertices # lame, add a better one
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/vertices.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_mesh.stl\(filepath='${TEST_OUT_DIR}/io_tests/export_stl_vertices.stl'\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_stl_vertices.stl
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=3fd3c877e573beeebc782532cc005820 --md5_method=FILE
|
2011-10-10 00:29:23 +00:00
|
|
|
)
|
2015-02-10 14:29:18 +00:00
|
|
|
endif()
|
2011-01-21 10:49:39 +00:00
|
|
|
|
|
|
|
|
2011-01-21 00:06:30 +00:00
|
|
|
# X3D Import
|
2015-02-10 14:29:18 +00:00
|
|
|
# disabled until updated & working
|
|
|
|
if(FALSE)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_x3d_cube
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_scene.x3d\(filepath='${TEST_SRC_DIR}/io_tests/x3d/color_cube.x3d'\)
|
|
|
|
--md5=3fae9be004199c145941cd3f9f80ad7b --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_x3d_cube.blend
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_x3d_teapot
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_scene.x3d\(filepath='${TEST_SRC_DIR}/io_tests/x3d/teapot.x3d'\)
|
|
|
|
--md5=8ee196c71947dce4199d55698501691e --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_x3d_teapot.blend
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_x3d_suzanne_material
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_scene.x3d\(filepath='${TEST_SRC_DIR}/io_tests/x3d/suzanne_material.x3d'\)
|
|
|
|
--md5=3edea1353257d8b5a5f071942f417be6 --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_x3d_suzanne_material.blend
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
# X3D Export
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_x3d_cube
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/all_quads.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.x3d\(filepath='${TEST_OUT_DIR}/io_tests/export_x3d_cube.x3d',use_selection=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_x3d_cube.x3d
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=05312d278fe41da33560fdfb9bdb268f --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_x3d_nurbs
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/nurbs.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.x3d\(filepath='${TEST_OUT_DIR}/io_tests/export_x3d_nurbs.x3d',use_selection=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_x3d_nurbs.x3d
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=4286d4a2aa507ef78b22ddcbdcc88481 --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_x3d_all_objects
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_scene/all_objects.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.x3d\(filepath='${TEST_OUT_DIR}/io_tests/export_x3d_all_objects.x3d',use_selection=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_x3d_all_objects.x3d
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=f5f9fa4c5619a0eeab66685aafd2f7f0 --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
2015-02-10 14:29:18 +00:00
|
|
|
endif()
|
2011-01-21 00:06:30 +00:00
|
|
|
|
2011-01-21 10:49:39 +00:00
|
|
|
|
|
|
|
|
2011-01-21 00:06:30 +00:00
|
|
|
# 3DS Import
|
2015-02-10 14:29:18 +00:00
|
|
|
# disabled until updated & working
|
|
|
|
if(FALSE)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_3ds_cube
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_scene.autodesk_3ds\(filepath='${TEST_SRC_DIR}/io_tests/3ds/cube.3ds'\)
|
|
|
|
--md5=cb5a45c35a343c3f5beca2a918472951 --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_3ds_cube.blend
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_3ds_hierarchy_lara
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_scene.autodesk_3ds\(filepath='${TEST_SRC_DIR}/io_tests/3ds/hierarchy_lara.3ds'\)
|
|
|
|
--md5=766c873d9fdb5f190e43796cfbae63b6 --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_3ds_hierarchy_lara.blend
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
import_3ds_hierarchy_greek_trireme
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
|
|
|
--run={'FINISHED'}&bpy.ops.import_scene.autodesk_3ds\(filepath='${TEST_SRC_DIR}/io_tests/3ds/hierarchy_greek_trireme.3ds'\)
|
|
|
|
--md5=b62ee30101e8999cb91ef4f8a8760056 --md5_method=SCENE
|
2019-06-25 17:52:37 +00:00
|
|
|
--write-blend=${TEST_OUT_DIR}/io_tests/import_3ds_hierarchy_greek_trireme.blend
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
2015-02-10 14:29:18 +00:00
|
|
|
endif()
|
2011-01-21 00:06:30 +00:00
|
|
|
|
|
|
|
# 3DS Export
|
2015-02-10 14:29:18 +00:00
|
|
|
# disabled until updated & working
|
|
|
|
if(FALSE)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_3ds_cube
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/all_quads.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.autodesk_3ds\(filepath='${TEST_OUT_DIR}/io_tests/export_3ds_cube.3ds',use_selection=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_3ds_cube.3ds
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=a31f5071b6c6dc7445b9099cdc7f63b3 --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_3ds_nurbs
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/nurbs.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.autodesk_3ds\(filepath='${TEST_OUT_DIR}/io_tests/export_3ds_nurbs.3ds',use_selection=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_3ds_nurbs.3ds
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=5bdd21be3c80d814fbc83cb25edb08c2 --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_3ds_all_objects
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_scene/all_objects.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.autodesk_3ds\(filepath='${TEST_OUT_DIR}/io_tests/export_3ds_all_objects.3ds',use_selection=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_3ds_all_objects.3ds
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=68447761ab0ca38e1e22e7c177ed48a8 --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
2015-02-10 14:29:18 +00:00
|
|
|
endif()
|
2011-01-21 00:06:30 +00:00
|
|
|
|
|
|
|
|
2011-01-21 10:49:39 +00:00
|
|
|
|
2011-01-21 00:06:30 +00:00
|
|
|
# FBX Export
|
|
|
|
# 'use_metadata=False' for reliable md5's
|
2015-02-10 14:29:18 +00:00
|
|
|
# disabled until updated & working
|
|
|
|
if(FALSE)
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_fbx_cube
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/all_quads.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/io_tests/export_fbx_cube.fbx',use_selection=False,use_metadata=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_fbx_cube.fbx
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=59a35577462f95f9a0b4e6035226ce9b --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_fbx_nurbs
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_geometry/nurbs.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/io_tests/export_fbx_nurbs.fbx',use_selection=False,use_metadata=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_fbx_nurbs.fbx
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=d31875f18f613fa0c3b16e978f87f6f8 --md5_method=FILE
|
2011-01-21 00:06:30 +00:00
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
export_fbx_all_objects
|
2019-04-17 04:35:54 +00:00
|
|
|
${TEST_SRC_DIR}/io_tests/blend_scene/all_objects.blend
|
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
2019-06-25 17:52:37 +00:00
|
|
|
--run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/io_tests/export_fbx_all_objects.fbx',use_selection=False,use_metadata=False\)
|
|
|
|
--md5_source=${TEST_OUT_DIR}/io_tests/export_fbx_all_objects.fbx
|
2019-04-17 04:35:54 +00:00
|
|
|
--md5=b35eb2a9d0e73762ecae2278c25a38ac --md5_method=FILE
|
2011-01-21 00:33:37 +00:00
|
|
|
)
|
2015-02-10 14:29:18 +00:00
|
|
|
endif()
|
2015-01-22 10:53:49 +00:00
|
|
|
|
2019-05-16 18:21:35 +00:00
|
|
|
if(WITH_CYCLES OR WITH_OPENGL_RENDER_TESTS)
|
|
|
|
if(NOT OPENIMAGEIO_IDIFF)
|
|
|
|
MESSAGE(STATUS "Disabling render tests because OIIO idiff does not exist")
|
|
|
|
elseif(NOT EXISTS "${TEST_SRC_DIR}/render/shader")
|
|
|
|
MESSAGE(STATUS "Disabling render tests because tests folder does not exist at ${TEST_SRC_DIR}")
|
|
|
|
else()
|
|
|
|
macro(add_cycles_render_test subject)
|
|
|
|
if(WITH_CYCLES)
|
|
|
|
add_python_test(
|
|
|
|
cycles_${subject}
|
|
|
|
${CMAKE_CURRENT_LIST_DIR}/cycles_render_tests.py
|
|
|
|
-blender "$<TARGET_FILE:blender>"
|
|
|
|
-testdir "${TEST_SRC_DIR}/render/${subject}"
|
|
|
|
-idiff "${OPENIMAGEIO_IDIFF}"
|
|
|
|
-outdir "${TEST_OUT_DIR}/cycles"
|
|
|
|
)
|
|
|
|
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/${subject}"
|
|
|
|
-idiff "${OPENIMAGEIO_IDIFF}"
|
|
|
|
-outdir "${TEST_OUT_DIR}/eevee"
|
|
|
|
)
|
|
|
|
|
|
|
|
add_python_test(
|
|
|
|
workbench_${subject}_test
|
|
|
|
${CMAKE_CURRENT_LIST_DIR}/workbench_render_tests.py
|
|
|
|
-blender "$<TARGET_FILE:blender>"
|
|
|
|
-testdir "${TEST_SRC_DIR}/render/${subject}"
|
|
|
|
-idiff "${OPENIMAGEIO_IDIFF}"
|
|
|
|
-outdir "${TEST_OUT_DIR}/workbench"
|
|
|
|
)
|
|
|
|
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)
|
2019-05-28 15:57:16 +00:00
|
|
|
if(WITH_OPENGL_RENDER_TESTS)
|
|
|
|
add_cycles_render_test(grease_pencil)
|
|
|
|
endif()
|
2019-05-16 18:21:35 +00:00
|
|
|
add_cycles_render_test(hair)
|
|
|
|
add_cycles_render_test(image_colorspace)
|
|
|
|
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)
|
|
|
|
endif()
|
2015-01-22 10:53:49 +00:00
|
|
|
endif()
|
Render Layers and Collections (merge from render-layers)
Design Documents
----------------
* https://wiki.blender.org/index.php/Dev:2.8/Source/Layers
* https://wiki.blender.org/index.php/Dev:2.8/Source/DataDesignRevised
User Commit Log
---------------
* New Layer and Collection system to replace render layers and viewport layers.
* A layer is a set of collections of objects (and their drawing options) required for specific tasks.
* A collection is a set of objects, equivalent of the old layers in Blender. A collection can be shared across multiple layers.
* All Scenes have a master collection that all other collections are children of.
* New collection "context" tab (in Properties Editor)
* New temporary viewport "collections" panel to control per-collection
visibility
Missing User Features
---------------------
* Collection "Filter"
Option to add objects based on their names
* Collection Manager operators
The existing buttons are placeholders
* Collection Manager drawing
The editor main region is empty
* Collection Override
* Per-Collection engine settings
This will come as a separate commit, as part of the clay-engine branch
Dev Commit Log
--------------
* New DNA file (DNA_layer_types.h) with the new structs
We are replacing Base by a new extended Base while keeping it backward
compatible with some legacy settings (i.e., lay, flag_legacy).
Renamed all Base to BaseLegacy to make it clear the areas of code that
still need to be converted
Note: manual changes were required on - deg_builder_nodes.h, rna_object.c, KX_Light.cpp
* Unittesting for main syncronization requirements
- read, write, add/copy/remove objects, copy scene, collection
link/unlinking, context)
* New Editor: Collection Manager
Based on patch by Julian Eisel
This is extracted from the layer-manager branch. With the following changes:
- Renamed references of layer manager to collections manager
- I doesn't include the editors/space_collections/ draw and util files
- The drawing code itself will be implemented separately by Julian
* Base / Object:
A little note about them. Original Blender code would try to keep them
in sync through the code, juggling flags back and forth. This will now
be handled by Depsgraph, keeping Object and Bases more separated
throughout the non-rendering code.
Scene.base is being cleared in doversion, and the old viewport drawing
code was poorly converted to use the new bases while the new viewport
code doesn't get merged and replace the old one.
Python API Changes
------------------
```
- scene.layers
+ # no longer exists
- scene.objects
+ scene.scene_layers.active.objects
- scene.objects.active
+ scene.render_layers.active.objects.active
- bpy.context.scene.objects.link()
+ bpy.context.scene_collection.objects.link()
- bpy_extras.object_utils.object_data_add(context, obdata, operator=None, use_active_layer=True, name=None)
+ bpy_extras.object_utils.object_data_add(context, obdata, operator=None, name=None)
- bpy.context.object.select
+ bpy.context.object.select = True
+ bpy.context.object.select = False
+ bpy.context.object.select_get()
+ bpy.context.object.select_set(action='SELECT')
+ bpy.context.object.select_set(action='DESELECT')
-AddObjectHelper.layers
+ # no longer exists
```
2017-02-07 09:18:38 +00:00
|
|
|
|
2018-02-14 19:33:33 +00:00
|
|
|
if(WITH_OPENGL_DRAW_TESTS)
|
2019-05-16 18:21:35 +00:00
|
|
|
if(NOT OPENIMAGEIO_IDIFF)
|
|
|
|
MESSAGE(STATUS "Disabling OpenGL draw tests because OIIO idiff does not exist")
|
|
|
|
elseif(NOT EXISTS "${TEST_SRC_DIR}/opengl")
|
|
|
|
MESSAGE(STATUS "Disabling OpenGL draw tests because tests folder does not exist at ${TEST_SRC_DIR}")
|
|
|
|
else()
|
2019-04-17 04:35:54 +00:00
|
|
|
# Use all subdirectories of opengl folder.
|
|
|
|
file(GLOB children RELATIVE ${TEST_SRC_DIR}/opengl ${TEST_SRC_DIR}/opengl/*)
|
|
|
|
foreach(child ${children})
|
|
|
|
# Resolve symlinks, useful to test production files with linked libraries.
|
|
|
|
get_filename_component(child_path ${TEST_SRC_DIR}/opengl/${child} REALPATH)
|
|
|
|
if(IS_DIRECTORY ${child_path})
|
|
|
|
file(GLOB_RECURSE blends "${child_path}/*.blend")
|
|
|
|
if(blends)
|
|
|
|
add_python_test(
|
|
|
|
opengl_draw_${child}
|
|
|
|
${CMAKE_CURRENT_LIST_DIR}/opengl_draw_tests.py
|
|
|
|
-blender "$<TARGET_FILE:blender>"
|
|
|
|
-testdir "${child_path}"
|
|
|
|
-idiff "${OPENIMAGEIO_IDIFF}"
|
|
|
|
-outdir "${TEST_OUT_DIR}/opengl_draw"
|
|
|
|
)
|
|
|
|
endif()
|
|
|
|
endif()
|
|
|
|
endforeach()
|
|
|
|
endif()
|
2018-02-14 19:33:33 +00:00
|
|
|
endif()
|
|
|
|
|
|
|
|
|
2017-04-14 10:54:20 +00:00
|
|
|
if(WITH_ALEMBIC)
|
2019-04-17 04:35:54 +00:00
|
|
|
find_package_wrapper(Alembic)
|
|
|
|
if(NOT ALEMBIC_FOUND)
|
|
|
|
message(FATAL_ERROR "Alembic is enabled but cannot be found")
|
|
|
|
endif()
|
|
|
|
get_filename_component(real_include_dir ${ALEMBIC_INCLUDE_DIR} REALPATH)
|
|
|
|
get_filename_component(ALEMBIC_ROOT_DIR ${real_include_dir} DIRECTORY)
|
|
|
|
|
|
|
|
add_python_test(
|
|
|
|
alembic_tests
|
|
|
|
${CMAKE_CURRENT_LIST_DIR}/alembic_tests.py
|
|
|
|
--blender "$<TARGET_FILE:blender>"
|
|
|
|
--testdir "${TEST_SRC_DIR}/alembic"
|
|
|
|
--alembic-root "${ALEMBIC_ROOT_DIR}"
|
|
|
|
)
|
|
|
|
|
2019-08-02 12:25:40 +00:00
|
|
|
add_blender_test(
|
|
|
|
script_alembic_import
|
2019-04-17 04:35:54 +00:00
|
|
|
--python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py
|
|
|
|
--
|
|
|
|
--testdir "${TEST_SRC_DIR}/alembic"
|
|
|
|
)
|
2017-04-14 10:54:20 +00:00
|
|
|
endif()
|
2017-04-18 12:18:06 +00:00
|
|
|
|
2018-03-05 14:32:49 +00:00
|
|
|
if(WITH_CODEC_FFMPEG)
|
2019-04-17 04:35:54 +00:00
|
|
|
add_python_test(
|
|
|
|
ffmpeg
|
|
|
|
${CMAKE_CURRENT_LIST_DIR}/ffmpeg_tests.py
|
|
|
|
--blender "$<TARGET_FILE:blender>"
|
2019-07-01 15:18:43 +00:00
|
|
|
--testdir "${TEST_SRC_DIR}/ffmpeg"
|
2019-04-17 04:35:54 +00:00
|
|
|
)
|
2018-03-05 14:32:49 +00:00
|
|
|
endif()
|
|
|
|
|
2018-02-24 12:11:30 +00:00
|
|
|
add_subdirectory(collada)
|
Collections and groups unification
OVERVIEW
* In 2.7 terminology, all layers and groups are now collection datablocks.
* These collections are nestable, linkable, instanceable, overrideable, ..
which opens up new ways to set up scenes and link + override data.
* Viewport/render visibility and selectability are now a part of the collection
and shared across all view layers and linkable.
* View layers define which subset of the scene collection hierarchy is excluded
for each. For many workflows one view layer can be used, these are more of an
advanced feature now.
OUTLINER
* The outliner now has a "View Layer" display mode instead of "Collections",
which can display the collections and/or objects in the view layer.
* In this display mode, collections can be excluded with the right click menu.
These will then be greyed out and their objects will be excluded.
* To view collections not linked to any scene, the "Blender File" display mode
can be used, with the new filtering option to just see Colleciton datablocks.
* The outliner right click menus for collections and objects were reorganized.
* Drag and drop still needs to be improved. Like before, dragging the icon or
text gives different results, we'll unify this later.
LINKING AND OVERRIDES
* Collections can now be linked into the scene without creating an instance,
with the link/append operator or from the collections view in the outliner.
* Collections can get static overrides with the right click menu in the outliner,
but this is rather unreliable and not clearly communicated at the moment.
* We still need to improve the make override operator to turn collection instances
into collections with overrides directly in the scene.
PERFORMANCE
* We tried to make performance not worse than before and improve it in some
cases. The main thing that's still a bit slower is multiple scenes, we have to
change the layer syncing to only updated affected scenes.
* Collections keep a list of their parent collections for faster incremental
updates in syncing and caching.
* View layer bases are now in a object -> base hash to avoid quadratic time
lookups internally and in API functions like visible_get().
VERSIONING
* Compatibility with 2.7 files should be improved due to the new visibility
controls. Of course users may not want to set up their scenes differently
now to avoid having separate layers and groups.
* Compatibility with 2.8 is mostly there, and was tested on Eevee demo and Hero
files. There's a few things which are know to be not quite compatible, like
nested layer collections inside groups.
* The versioning code for 2.8 files is quite complicated, and isolated behind
#ifdef so it can be removed at the end of the release cycle.
KNOWN ISSUES
* The G-key group operators in the 3D viewport were left mostly as is, they
need to be modified still to fit better.
* Same for the groups panel in the object properties. This needs to be updated
still, or perhaps replaced by something better.
* Collections must all have a unique name. Less restrictive namespacing is to
be done later, we'll have to see how important this is as all objects within
the collections must also have a unique name anyway.
* Full scene copy and delete scene are exactly doing the right thing yet.
Differential Revision: https://developer.blender.org/D3383
https://code.blender.org/2018/05/collections-and-groups/
2018-04-30 13:57:22 +00:00
|
|
|
|
|
|
|
# TODO: disabled for now after collection unification
|
|
|
|
# add_subdirectory(view_layer)
|