[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61767] trunk/lib/tests/layers: Update render layer tests
Dalai Felinto
dfelinto at gmail.com
Thu Dec 22 12:33:09 CET 2016
Revision: 61767
https://developer.blender.org/rBL61767
Author: dfelinto
Date: 2016-12-22 12:33:09 +0100 (Thu, 22 Dec 2016)
Log Message:
-----------
Update render layer tests
(render-layers branch for now, soon to be blender2.8)
Modified Paths:
--------------
trunk/lib/tests/layers/layers.blend
trunk/lib/tests/layers/layers.json
trunk/lib/tests/layers/layers_copy_full.json
trunk/lib/tests/layers/layers_copy_full_simple.json
trunk/lib/tests/layers/layers_copy_link.json
trunk/lib/tests/layers/layers_simple.json
Added Paths:
-----------
trunk/lib/tests/layers/layers_layer_collection_link.json
trunk/lib/tests/layers/layers_layer_collection_unlink.json
trunk/lib/tests/layers/layers_nested.json
trunk/lib/tests/layers/layers_new_layer.json
Modified: trunk/lib/tests/layers/layers.blend
===================================================================
(Binary files differ)
Modified: trunk/lib/tests/layers/layers.json
===================================================================
--- trunk/lib/tests/layers/layers.json 2016-12-15 03:10:47 UTC (rev 61766)
+++ trunk/lib/tests/layers/layers.json 2016-12-22 11:33:09 UTC (rev 61767)
@@ -59,7 +59,7 @@
"objects": []
}
]{
- "1,2,3": {
+ "1,2": {
"active_object": "",
"collections": {
"1": {
@@ -81,7 +81,38 @@
"objects": [
"T.2a"
]
+ }
+ },
+ "engine": "BLENDER_RENDER",
+ "name": "1,2",
+ "objects": [
+ "T.1a",
+ "T.2a"
+ ]
+ },
+ "1-3": {
+ "active_object": "",
+ "collections": {
+ "1": {
+ "collections": {},
+ "is_folded": true,
+ "is_selectable": true,
+ "is_visible": true,
+ "name": "1",
+ "objects": [
+ "T.1a"
+ ]
},
+ "2": {
+ "collections": {},
+ "is_folded": true,
+ "is_selectable": true,
+ "is_visible": true,
+ "name": "2",
+ "objects": [
+ "T.2a"
+ ]
+ },
"3": {
"collections": {},
"is_folded": true,
@@ -98,7 +129,7 @@
}
},
"engine": "BLENDER_RENDER",
- "name": "1,2,3",
+ "name": "1-3",
"objects": [
"T.1a",
"T.2a",
@@ -137,7 +168,7 @@
"T.3a"
]
},
- "45": {
+ "4,5": {
"active_object": "",
"collections": {
"4": {
@@ -163,7 +194,7 @@
}
},
"engine": "BLENDER_RENDER",
- "name": "45",
+ "name": "4,5",
"objects": [
"T.4a",
"T.3,5a",
Modified: trunk/lib/tests/layers/layers_copy_full.json
===================================================================
--- trunk/lib/tests/layers/layers_copy_full.json 2016-12-15 03:10:47 UTC (rev 61766)
+++ trunk/lib/tests/layers/layers_copy_full.json 2016-12-22 11:33:09 UTC (rev 61767)
@@ -59,7 +59,7 @@
"objects": []
}
]{
- "1,2,3": {
+ "1,2": {
"active_object": "",
"collections": {
"1": {
@@ -81,7 +81,38 @@
"objects": [
"T.2a.001"
]
+ }
+ },
+ "engine": "BLENDER_RENDER",
+ "name": "1,2",
+ "objects": [
+ "T.1a.001",
+ "T.2a.001"
+ ]
+ },
+ "1-3": {
+ "active_object": "",
+ "collections": {
+ "1": {
+ "collections": {},
+ "is_folded": true,
+ "is_selectable": true,
+ "is_visible": true,
+ "name": "1",
+ "objects": [
+ "T.1a.001"
+ ]
},
+ "2": {
+ "collections": {},
+ "is_folded": true,
+ "is_selectable": true,
+ "is_visible": true,
+ "name": "2",
+ "objects": [
+ "T.2a.001"
+ ]
+ },
"3": {
"collections": {},
"is_folded": true,
@@ -98,7 +129,7 @@
}
},
"engine": "BLENDER_RENDER",
- "name": "1,2,3",
+ "name": "1-3",
"objects": [
"T.1a.001",
"T.2a.001",
@@ -137,7 +168,7 @@
"T.3a.001"
]
},
- "45": {
+ "4,5": {
"active_object": "",
"collections": {
"4": {
@@ -163,7 +194,7 @@
}
},
"engine": "BLENDER_RENDER",
- "name": "45",
+ "name": "4,5",
"objects": [
"T.4a.001",
"T.3,5a.001",
Modified: trunk/lib/tests/layers/layers_copy_full_simple.json
===================================================================
--- trunk/lib/tests/layers/layers_copy_full_simple.json 2016-12-15 03:10:47 UTC (rev 61766)
+++ trunk/lib/tests/layers/layers_copy_full_simple.json 2016-12-22 11:33:09 UTC (rev 61767)
@@ -26,6 +26,7 @@
"filter_objects": [],
"name": "3",
"objects": [
+ "T.3,5a.001",
"T.3d.001",
"T.3c.001",
"T.3b.001",
@@ -47,6 +48,7 @@
"filter_objects": [],
"name": "5",
"objects": [
+ "T.3,5a",
"T.5a.001"
]
}
Modified: trunk/lib/tests/layers/layers_copy_link.json
===================================================================
--- trunk/lib/tests/layers/layers_copy_link.json 2016-12-15 03:10:47 UTC (rev 61766)
+++ trunk/lib/tests/layers/layers_copy_link.json 2016-12-22 11:33:09 UTC (rev 61767)
@@ -59,7 +59,7 @@
"objects": []
}
]{
- "1,2,3": {
+ "1,2": {
"active_object": "",
"collections": {
"1": {
@@ -81,7 +81,38 @@
"objects": [
"T.2a"
]
+ }
+ },
+ "engine": "BLENDER_RENDER",
+ "name": "1,2",
+ "objects": [
+ "T.1a",
+ "T.2a"
+ ]
+ },
+ "1-3": {
+ "active_object": "",
+ "collections": {
+ "1": {
+ "collections": {},
+ "is_folded": true,
+ "is_selectable": true,
+ "is_visible": true,
+ "name": "1",
+ "objects": [
+ "T.1a"
+ ]
},
+ "2": {
+ "collections": {},
+ "is_folded": true,
+ "is_selectable": true,
+ "is_visible": true,
+ "name": "2",
+ "objects": [
+ "T.2a"
+ ]
+ },
"3": {
"collections": {},
"is_folded": true,
@@ -98,7 +129,7 @@
}
},
"engine": "BLENDER_RENDER",
- "name": "1,2,3",
+ "name": "1-3",
"objects": [
"T.1a",
"T.2a",
@@ -137,7 +168,7 @@
"T.3a"
]
},
- "45": {
+ "4,5": {
"active_object": "",
"collections": {
"4": {
@@ -163,7 +194,7 @@
}
},
"engine": "BLENDER_RENDER",
- "name": "45",
+ "name": "4,5",
"objects": [
"T.4a",
"T.3,5a",
Added: trunk/lib/tests/layers/layers_layer_collection_link.json
===================================================================
--- trunk/lib/tests/layers/layers_layer_collection_link.json (rev 0)
+++ trunk/lib/tests/layers/layers_layer_collection_link.json 2016-12-22 11:33:09 UTC (rev 61767)
@@ -0,0 +1,594 @@
+[
+ "Master Collection",
+ {
+ "collections": {
+ "1": {
+ "collections": {
+ "sub-zero": {
+ "collections": {
+ "scorpion": {
+ "collections": {},
+ "filter": "",
+ "filter_objects": [],
+ "name": "scorpion",
+ "objects": [
+ "T.3c"
+ ]
+ }
+ },
+ "filter": "",
+ "filter_objects": [],
+ "name": "sub-zero",
+ "objects": [
+ "T.3b"
+ ]
+ }
+ },
+ "filter": "",
+ "filter_objects": [],
+ "name": "1",
+ "objects": [
+ "T.1a"
+ ]
+ },
+ "2": {
+ "collections": {},
+ "filter": "",
+ "filter_objects": [],
+ "name": "2",
+ "objects": [
+ "T.2a"
+ ]
+ },
+ "3": {
+ "collections": {},
+ "filter": "",
+ "filter_objects": [],
+ "name": "3",
+ "objects": [
+ "T.3,5a",
+ "T.3d",
+ "T.3c",
+ "T.3b",
+ "T.3a"
+ ]
+ },
+ "4": {
+ "collections": {},
+ "filter": "",
+ "filter_objects": [],
+ "name": "4",
+ "objects": [
+ "T.4a"
+ ]
+ },
+ "5": {
+ "collections": {},
+ "filter": "",
+ "filter_objects": [],
+ "name": "5",
+ "objects": [
+ "T.3,5a",
+ "T.5a"
+ ]
+ }
+ },
+ "filter": "",
+ "filter_objects": [],
+ "name": "Master Collection",
+ "objects": []
+ }
+]{
+ "1,2": {
+ "active_object": "",
+ "collections": {
+ "1": {
+ "collections": {
+ "sub-zero": {
+ "collections": {
+ "scorpion": {
+ "collections": {},
+ "is_folded": true,
+ "is_selectable": true,
+ "is_visible": true,
+ "name": "scorpion",
+ "objects": [
+ "T.3c"
+ ]
+ }
+ },
+ "is_folded": true,
+ "is_selectable": true,
+ "is_visible": true,
+ "name": "sub-zero",
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list