Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: prevent field from being dumped if unused

Browse Source 
fix: bl_object tests
This commit is contained in:
Swann
2021-04-14 16:25:21 +02:00
parent 736c3df7c4
commit 570909a7c4
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
multi_user/bl_types/bl_object.py
View File

@ -69,7 +69,7 @@ def dump_physics(target: bpy.types.Object)->dict:
physics_data['collision'] = dumper.dump(target.collision) physics_data['collision'] = dumper.dump(target.collision)
# Field (field) # Field (field)
if target.field and target.field.type != "None": if target.field and target.field.type != "NONE":
physics_data['field'] = dumper.dump(target.field) physics_data['field'] = dumper.dump(target.field)
# Rigid Body (rigid_body) # Rigid Body (rigid_body)
@ -538,6 +538,7 @@ class BlObject(BlDatablock):
if modifiers: if modifiers:
dumper.include_filter = None dumper.include_filter = None
dumper.depth = 1 dumper.depth = 1
dumper.exclude_filter = ['is_active']
for index, modifier in enumerate(modifiers): for index, modifier in enumerate(modifiers):
dumped_modifier = dumper.dump(modifier) dumped_modifier = dumper.dump(modifier)
# hack to dump geometry nodes inputs # hack to dump geometry nodes inputs

2
scripts/test_addon.py
View File

@ -13,7 +13,7 @@ def main():
if len(sys.argv) > 2: if len(sys.argv) > 2:
blender_rev = sys.argv[2] blender_rev = sys.argv[2]
else: else:
blender_rev = "2.91.0" blender_rev = "2.92.0"
try: try:
exit_val = BAT.test_blender_addon(addon_path=addon, blender_revision=blender_rev) exit_val = BAT.test_blender_addon(addon_path=addon, blender_revision=blender_rev)

7
tests/test_bl_types/test_object.py
View File

@ -7,7 +7,7 @@ import bpy
import random import random
from multi_user.bl_types.bl_object import BlObject from multi_user.bl_types.bl_object import BlObject
# Removed 'BUILD' modifier because the seed doesn't seems to be # Removed 'BUILD', 'SOFT_BODY' modifier because the seed doesn't seems to be
# correctly initialized (#TODO: report the bug) # correctly initialized (#TODO: report the bug)
MOFIFIERS_TYPES = [ MOFIFIERS_TYPES = [
'DATA_TRANSFER', 'MESH_CACHE', 'MESH_SEQUENCE_CACHE', 'DATA_TRANSFER', 'MESH_CACHE', 'MESH_SEQUENCE_CACHE',
@ -22,8 +22,7 @@ MOFIFIERS_TYPES = [
'MESH_DEFORM', 'SHRINKWRAP', 'SIMPLE_DEFORM', 'SMOOTH', 'MESH_DEFORM', 'SHRINKWRAP', 'SIMPLE_DEFORM', 'SMOOTH',
'CORRECTIVE_SMOOTH', 'LAPLACIANSMOOTH', 'SURFACE_DEFORM', 'CORRECTIVE_SMOOTH', 'LAPLACIANSMOOTH', 'SURFACE_DEFORM',
'WARP', 'WAVE', 'CLOTH', 'COLLISION', 'DYNAMIC_PAINT', 'WARP', 'WAVE', 'CLOTH', 'COLLISION', 'DYNAMIC_PAINT',
'EXPLODE', 'FLUID', 'OCEAN', 'PARTICLE_INSTANCE', 'EXPLODE', 'FLUID', 'OCEAN', 'PARTICLE_INSTANCE', 'SURFACE']
'SOFT_BODY', 'SURFACE']
GP_MODIFIERS_TYPE = [ GP_MODIFIERS_TYPE = [
'GP_ARRAY', 'GP_BUILD', 'GP_MIRROR', 'GP_MULTIPLY', 'GP_ARRAY', 'GP_BUILD', 'GP_MIRROR', 'GP_MULTIPLY',
@ -72,5 +71,5 @@ def test_object(clear_blend):
test = implementation._construct(expected) test = implementation._construct(expected)
implementation._load(expected, test) implementation._load(expected, test)
result = implementation._dump(test) result = implementation._dump(test)
print(DeepDiff(expected, result))
assert not DeepDiff(expected, result) assert not DeepDiff(expected, result)