Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Mon, 5 Jun 2017 08:11:59 +0000 (18:11 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 5 Jun 2017 08:11:59 +0000 (18:11 +1000)
1  2 
source/blender/editors/transform/transform.c
source/blender/python/intern/bpy_rna.c
tests/python/CMakeLists.txt

index 65e348336b4f06eda79f76bed7c1fbe1256f2c23,d3067a22ee764c1c1309ffb5a6a10822d2530607..986a09b8f79c6e219f89f074a0d25304bbf6aa57
@@@ -480,7 -483,11 +483,13 @@@ if(WITH_ALEMBIC
                        --testdir "${TEST_SRC_DIR}/alembic"
                        --alembic-root "${ALEMBIC_ROOT_DIR}"
                )
+               add_test(script_alembic_import ${TEST_BLENDER_EXE}
+               --python ${CMAKE_CURRENT_LIST_DIR}/bl_alembic_import_test.py
+               --
+               --testdir "${TEST_SRC_DIR}/alembic"
+               )
        endif()
  endif()
 +
 +add_subdirectory(render_layer)