autour_de_minuit/blender-asset-tracer
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix external smoke caches not being packed

Browse Source
This commit is contained in:
Sybren A. Stüvel 2019-09-27 12:19:22 +02:00
parent 5988f3599a
commit e7cd6ab70d
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -10,6 +10,7 @@ changed functionality, fixed bugs).
- Windows compatibility fix when using different assets with the same path but on different drives. - Windows compatibility fix when using different assets with the same path but on different drives.
- Allow setting the Shaman JWT authentication token in the `SHAMAN_JWT_TOKEN` environment variable. - Allow setting the Shaman JWT authentication token in the `SHAMAN_JWT_TOKEN` environment variable.
- Blender 2.81 compatibility fix. - Blender 2.81 compatibility fix.
- Fix for external smoke caches not being packed.
## Version 1.1.1 (2019-04-18) ## Version 1.1.1 (2019-04-18)

14
blender_asset_tracer/trace/modifier_walkers.py
View File

@ -158,7 +158,13 @@ def _walk_point_cache(ctx: ModifierContext,
pointcache: blendfile.BlendFileBlock, pointcache: blendfile.BlendFileBlock,
extension: bytes): extension: bytes):
flag = pointcache[b'flag'] flag = pointcache[b'flag']
if flag & cdefs.PTCACHE_DISK_CACHE: if flag & cdefs.PTCACHE_EXTERNAL:
path, field = pointcache.get(b'path', return_field=True)
log.info(' external cache at %s', path)
bpath = bpathlib.BlendPath(path)
yield result.BlockUsage(pointcache, bpath, path_full_field=field,
is_sequence=True, block_name=block_name)
elif flag & cdefs.PTCACHE_DISK_CACHE:
# See ptcache_path() in pointcache.c # See ptcache_path() in pointcache.c
name, field = pointcache.get(b'name', return_field=True) name, field = pointcache.get(b'name', return_field=True)
if not name: if not name:
@ -170,11 +176,7 @@ def _walk_point_cache(ctx: ModifierContext,
bfile.filepath.stem.encode(), bfile.filepath.stem.encode(),
name, name,
extension) extension)
bpath = bpathlib.BlendPath(path) log.info(' disk cache at %s', path)
yield result.BlockUsage(pointcache, bpath, path_full_field=field,
is_sequence=True, block_name=block_name)
if flag & cdefs.PTCACHE_EXTERNAL:
path, field = pointcache.get(b'path', return_field=True)
bpath = bpathlib.BlendPath(path) bpath = bpathlib.BlendPath(path)
yield result.BlockUsage(pointcache, bpath, path_full_field=field, yield result.BlockUsage(pointcache, bpath, path_full_field=field,
is_sequence=True, block_name=block_name) is_sequence=True, block_name=block_name)