forked from bartvdbraak/blender
- update X3D and FBX testing checksums
- building with GHOST/SDL now adds the PREFIX - image.external_edit operator errors out if the filepath isnt set (was annoying and loaded gimp while running tests)
This commit is contained in:
parent
fad243a4bf
commit
0160901c90
@ -149,6 +149,10 @@ if(WITH_HEADLESS OR WITH_GHOST_SDL)
|
||||
intern/GHOST_SystemPathsX11.cpp
|
||||
intern/GHOST_SystemPathsX11.h
|
||||
)
|
||||
|
||||
if(NOT WITH_INSTALL_PORTABLE)
|
||||
add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
|
||||
endif()
|
||||
elseif(WIN32)
|
||||
|
||||
list(APPEND SRC
|
||||
@ -204,10 +208,6 @@ elseif(APPLE)
|
||||
|
||||
elseif(UNIX)
|
||||
|
||||
if(WITH_X11_XINPUT)
|
||||
add_definitions(-DWITH_X11_XINPUT)
|
||||
endif()
|
||||
|
||||
list(APPEND INC_SYS
|
||||
${X11_X11_INCLUDE_PATH}
|
||||
)
|
||||
@ -224,10 +224,6 @@ elseif(UNIX)
|
||||
intern/GHOST_WindowX11.h
|
||||
)
|
||||
|
||||
if(NOT WITH_INSTALL_PORTABLE)
|
||||
add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
|
||||
endif()
|
||||
|
||||
if(X11_XF86keysym_INCLUDE_PATH)
|
||||
add_definitions(-DWITH_XF86KEYSYM)
|
||||
list(APPEND INC_SYS
|
||||
@ -243,6 +239,14 @@ elseif(UNIX)
|
||||
)
|
||||
endif()
|
||||
|
||||
if(NOT WITH_INSTALL_PORTABLE)
|
||||
add_definitions(-DPREFIX="${CMAKE_INSTALL_PREFIX}")
|
||||
endif()
|
||||
|
||||
if(WITH_X11_XINPUT)
|
||||
add_definitions(-DWITH_X11_XINPUT)
|
||||
endif()
|
||||
|
||||
elseif(WIN32)
|
||||
if(MSVC)
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
|
||||
|
@ -61,13 +61,19 @@ class EditExternally(bpy.types.Operator):
|
||||
def execute(self, context):
|
||||
import os
|
||||
import subprocess
|
||||
filepath = os.path.normpath(bpy.path.abspath(self.filepath))
|
||||
|
||||
filepath = self.filepath
|
||||
|
||||
if not filepath:
|
||||
self.report({'ERROR'}, "Image path not set")
|
||||
return {'CANCELLED'}
|
||||
|
||||
filepath = os.path.normpath(bpy.path.abspath(filepath))
|
||||
|
||||
if not os.path.exists(filepath):
|
||||
self.report({'ERROR'},
|
||||
"Image path %r not found, image may be packed or "
|
||||
"unsaved." % filepath)
|
||||
|
||||
return {'CANCELLED'}
|
||||
|
||||
cmd = self._editor_guess(context) + [filepath]
|
||||
|
@ -111,7 +111,7 @@ add_test(export_obj_all_objects ${TEST_BLENDER_EXE}
|
||||
--run={'FINISHED'}&bpy.ops.export_scene.obj\(filepath='${TEST_OUT_DIR}/export_obj_all_objects.obj',use_selection=False,use_nurbs=True\)
|
||||
--md5_source=${TEST_OUT_DIR}/export_obj_all_objects.obj
|
||||
--md5_source=${TEST_OUT_DIR}/export_obj_all_objects.mtl
|
||||
--md5=01c123948efadc6a71ab2c09a5925756 --md5_method=FILE
|
||||
--md5=04b3ed97cede07a19548fc518ce9f8ca --md5_method=FILE
|
||||
)
|
||||
|
||||
|
||||
@ -196,7 +196,7 @@ add_test(export_x3d_cube ${TEST_BLENDER_EXE}
|
||||
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
||||
--run={'FINISHED'}&bpy.ops.export_scene.x3d\(filepath='${TEST_OUT_DIR}/export_x3d_cube.x3d',use_selection=False\)
|
||||
--md5_source=${TEST_OUT_DIR}/export_x3d_cube.x3d
|
||||
--md5=5e804c689896116331fa190a9fabbad4 --md5_method=FILE
|
||||
--md5=2621d8cc2cc1d34f6711c54519907dac --md5_method=FILE
|
||||
)
|
||||
|
||||
add_test(export_x3d_nurbs ${TEST_BLENDER_EXE}
|
||||
@ -204,7 +204,7 @@ add_test(export_x3d_nurbs ${TEST_BLENDER_EXE}
|
||||
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
||||
--run={'FINISHED'}&bpy.ops.export_scene.x3d\(filepath='${TEST_OUT_DIR}/export_x3d_nurbs.x3d',use_selection=False\)
|
||||
--md5_source=${TEST_OUT_DIR}/export_x3d_nurbs.x3d
|
||||
--md5=2d5bcf43cf7b6fbbef1c8cc566968fe5 --md5_method=FILE
|
||||
--md5=d56b3736bab063d101d42079bd276f01 --md5_method=FILE
|
||||
)
|
||||
|
||||
add_test(export_x3d_all_objects ${TEST_BLENDER_EXE}
|
||||
@ -212,7 +212,7 @@ add_test(export_x3d_all_objects ${TEST_BLENDER_EXE}
|
||||
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
||||
--run={'FINISHED'}&bpy.ops.export_scene.x3d\(filepath='${TEST_OUT_DIR}/export_x3d_all_objects.x3d',use_selection=False\)
|
||||
--md5_source=${TEST_OUT_DIR}/export_x3d_all_objects.x3d
|
||||
--md5=2809ec13a4cab55d265ce7525c5db1b7 --md5_method=FILE
|
||||
--md5=0914c9a7fcdbfc5741c1269497e9068b --md5_method=FILE
|
||||
)
|
||||
|
||||
|
||||
@ -273,7 +273,7 @@ add_test(export_fbx_cube ${TEST_BLENDER_EXE}
|
||||
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
||||
--run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/export_fbx_cube.fbx',use_selection=False,use_metadata=False\)
|
||||
--md5_source=${TEST_OUT_DIR}/export_fbx_cube.fbx
|
||||
--md5=83dca99a0cb338852b8c85951a44c68a --md5_method=FILE
|
||||
--md5=86da2495dffd7c270e682f599be6b3d1 --md5_method=FILE
|
||||
)
|
||||
|
||||
add_test(export_fbx_nurbs ${TEST_BLENDER_EXE}
|
||||
@ -281,7 +281,7 @@ add_test(export_fbx_nurbs ${TEST_BLENDER_EXE}
|
||||
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
||||
--run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/export_fbx_nurbs.fbx',use_selection=False,use_metadata=False\)
|
||||
--md5_source=${TEST_OUT_DIR}/export_fbx_nurbs.fbx
|
||||
--md5=c7d9491ffa6264e820ed1e12df63f871 --md5_method=FILE
|
||||
--md5=88a263ddb5181e6522dc214debb92ced --md5_method=FILE
|
||||
)
|
||||
|
||||
add_test(export_fbx_all_objects ${TEST_BLENDER_EXE}
|
||||
@ -289,5 +289,5 @@ add_test(export_fbx_all_objects ${TEST_BLENDER_EXE}
|
||||
--python ${CMAKE_CURRENT_LIST_DIR}/bl_test.py --
|
||||
--run={'FINISHED'}&bpy.ops.export_scene.fbx\(filepath='${TEST_OUT_DIR}/export_fbx_all_objects.fbx',use_selection=False,use_metadata=False\)
|
||||
--md5_source=${TEST_OUT_DIR}/export_fbx_all_objects.fbx
|
||||
--md5=22867f82e1615fd1eae18cfaac8ba035 --md5_method=FILE
|
||||
--md5=e6f75fe7de9aa366896456e13eafc76a --md5_method=FILE
|
||||
)
|
||||
|
Loading…
Reference in New Issue
Block a user