瀏覽代碼

Use Blender2.80 stable build for travis CI

Blender API is keep changing in Blender master branch, which makes it
hard to do regression tests. Here, switch back to Blender2.80 stable
for all the testing. Will consider testing with up-to-date API when
Blender2.81 releases.
Jason0214 6 年之前
父節點
當前提交
e7a4f3b963
共有 2 個文件被更改,包括 5 次插入14 次删除
  1. 1 4
      io_scene_godot/converters/material/material.py
  2. 4 10
      tests/install_blender.sh

+ 1 - 4
io_scene_godot/converters/material/material.py

@@ -89,12 +89,9 @@ def generate_material_resource(escn_file, export_settings, bl_object,
             logging.error(
                 "%s, in material '%s'", str(exception), material.name
             )
-
-    elif export_settings['material_mode'] == 'SPATIAL':
+    else:  # Spatial Material
         mat = export_as_spatial_material(material_rsc_name, material)
 
-    assert mat is not None
-
     # make material-object tuple as an identifier, as uniforms is part of
     # material and they are binded with object
     return escn_file.add_internal_resource(mat, (bl_object, material))

+ 4 - 10
tests/install_blender.sh

@@ -2,26 +2,20 @@
 
 set -e
 
-# hack, may be removed after find a stable blender2.8 build
-BLENDER_ORG_HOMEPAGE="https://builder.blender.org"
-DOWNLOAD_PAGE_HTML="`wget -qO- ${BLENDER_ORG_HOMEPAGE}/download`"
-DAILY_BUILD_REGEX_PATTERN='href="([^"]+)" title="Download Dev Linux 64 bit master"'
-[[ ${DOWNLOAD_PAGE_HTML} =~ ${DAILY_BUILD_REGEX_PATTERN} ]]
-BLENDER_28_LINUX_64_PATH=${BASH_REMATCH[1]}
+BLENDER_28_LINUX_64_URL="https://mirror.clarkson.edu/blender/release/Blender2.80/blender-2.80-linux-glibc217-x86_64.tar.bz2"
 
-BLENDER_DIRNAME_REGEX_PATTERN='/download/(.+)\.tar\.bz2$'
-[[ ${BLENDER_28_LINUX_64_PATH} =~ ${BLENDER_DIRNAME_REGEX_PATTERN} ]]
+BLENDER_DIRNAME_REGEX_PATTERN='/Blender2\.80/(.+)\.tar\.bz2$'
+[[ ${BLENDER_28_LINUX_64_URL} =~ ${BLENDER_DIRNAME_REGEX_PATTERN} ]]
 NAME=${BASH_REMATCH[1]}
 
 VERSION=2.80
 CACHE="${HOME}/.blender-cache"
 TAR="${CACHE}/${NAME}.tar.bz2"
-URL="${BLENDER_ORG_HOMEPAGE}/${BLENDER_28_LINUX_64_PATH}"
 
 echo "Installing Blender ${VERSION}"
 mkdir -p $CACHE
 if [ ! -f $TAR ]; then
-    wget -O $TAR $URL
+    wget -O $TAR $BLENDER_28_LINUX_64_URL
 fi
 tar -xjf $TAR -C $HOME