archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Oops.

Browse Source
This commit is contained in:
Sybren A. Stüvel 2016-07-20 14:25:22 +02:00
parent 4a72b377bd
commit 49bd2720fa
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pillar/application/modules/blender_cloud/texture_libs.py
View File

@ -8,6 +8,7 @@ from werkzeug.datastructures import MultiDict
from werkzeug.exceptions import InternalServerError from werkzeug.exceptions import InternalServerError
from application import utils from application import utils
from application.utils.authentication import current_user_id
from application.utils.authorization import require_login from application.utils.authorization import require_login
FIRST_ADDON_VERSION_WITH_HDRI = (1, 4, 0) FIRST_ADDON_VERSION_WITH_HDRI = (1, 4, 0)
@ -73,7 +74,11 @@ def texture_libraries():
# Determine whether to return HDRi projects too, based on the version # Determine whether to return HDRi projects too, based on the version
# of the Blender Cloud Addon. If the addon version is None, we're dealing # of the Blender Cloud Addon. If the addon version is None, we're dealing
# with a version of the BCA that's so old it doesn't send its version along. # with a version of the BCA that's so old it doesn't send its version along.
return_hdri = blender_cloud_addon_version() > FIRST_ADDON_VERSION_WITH_HDRI addon_version = blender_cloud_addon_version()
return_hdri = addon_version >= FIRST_ADDON_VERSION_WITH_HDRI
log.debug('User %s has Blender Cloud Addon version %s; return_hdri=%s',
current_user_id(), addon_version, return_hdri)
accept_as_library = functools.partial(has_texture_node, return_hdri=return_hdri) accept_as_library = functools.partial(has_texture_node, return_hdri=return_hdri)
# Construct eve-like response. # Construct eve-like response.

2
tests/test_bcloud_home_project.py
View File

@ -506,5 +506,5 @@ class TextureLibraryTest(AbstractHomeProjectTest):
headers={'Blender-Cloud-Addon': '1.4.0'}) headers={'Blender-Cloud-Addon': '1.4.0'})
libs = resp.json()['_items'] libs = resp.json()['_items']
library_project_ids = {proj['_id'] for proj in libs} library_project_ids = {proj['_id'] for proj in libs}
self.assertNotIn(unicode(self.hdri_proj_id), library_project_ids) self.assertIn(unicode(self.hdri_proj_id), library_project_ids)
self.assertIn(unicode(self.tex_proj_id), library_project_ids) self.assertIn(unicode(self.tex_proj_id), library_project_ids)