blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Layers: move SceneCollection 

This is to be used from the Outliner, when dragging and dropping.
It does not include moving LayerCollection (from Active Render Layer)
This commit is contained in:
Dalai Felinto 2017-03-03 16:14:21 +01:00
parent 9b2877ad88
commit 3a1748146b
51 changed files with 3134 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons

@ -1 +1 @@
Subproject commit f2bb66b68b4071c6554cae881010a783b3ebbdf0
Subproject commit 371960484a38fc64e0a2635170a41a0d8ab2f6bd

4
source/blender/blenkernel/BKE_collection.h
View File

@ -55,6 +55,10 @@ void BKE_collections_object_remove(struct Main *bmain, struct Scene *scene, stru
void BKE_collection_reinsert_after(const struct Scene *scene, struct SceneCollection *sc_reinsert, struct SceneCollection *sc_after);
void BKE_collection_reinsert_into(struct SceneCollection *sc_reinsert, struct SceneCollection *sc_into);
bool BKE_collection_move_above(const struct Scene *scene, struct SceneCollection *sc_dst, struct SceneCollection *sc_src);
bool BKE_collection_move_below(const struct Scene *scene, struct SceneCollection *sc_dst, struct SceneCollection *sc_src);
bool BKE_collection_move_into(const struct Scene *scene, struct SceneCollection *sc_dst, struct SceneCollection *sc_src);
typedef void (*BKE_scene_objects_Cb)(struct Object *ob, void *data);
typedef void (*BKE_scene_collections_Cb)(struct SceneCollection *ob, void *data);

9
source/blender/blenkernel/BKE_layer.h
View File

@ -84,9 +84,14 @@ struct LayerCollection *BKE_layer_collection_active(struct SceneLayer *sl);
int BKE_layer_collection_count(struct SceneLayer *sl);
int BKE_layer_collection_findindex(struct SceneLayer *sl, struct LayerCollection *lc);
void BKE_layer_collection_reinsert_after(const struct Scene *scene, struct SceneLayer *sl,
bool BKE_layer_collection_reinsert_after(const struct Scene *scene, struct SceneLayer *sl,
struct LayerCollection *lc_reinsert, struct LayerCollection *lc_after);
void BKE_layer_collection_reinsert_into(struct LayerCollection *lc_reinsert, struct LayerCollection *lc_into);
bool BKE_layer_collection_move_above(const struct Scene *scene, struct LayerCollection *lc_dst, struct LayerCollection *lc_src);
bool BKE_layer_collection_move_below(const struct Scene *scene, struct LayerCollection *lc_dst, struct LayerCollection *lc_src);
bool BKE_layer_collection_move_into(const struct Scene *scene, struct LayerCollection *lc_dst, struct LayerCollection *lc_src);
void BKE_layer_collection_resync(const struct Scene *scene, const struct SceneCollection *sc);
struct LayerCollection *BKE_collection_link(struct SceneLayer *sl, struct SceneCollection *sc);

146
source/blender/blenkernel/intern/collection.c
View File

@ -298,16 +298,150 @@ void BKE_collections_object_remove(Main *bmain, Scene *scene, Object *ob, const
FOREACH_SCENE_COLLECTION_END
}
void BKE_collection_reinsert_after(const struct Scene *scene, SceneCollection *sc_reinsert, SceneCollection *sc_after)
/* ---------------------------------------------------------------------- */
/* Outliner drag and drop */
/**
* Find and return the SceneCollection that has \a sc_child as one of its directly
* nested SceneCollection.
*
* \param sc_parent Initial SceneCollection to look into recursively, usually the master collection
*/
static SceneCollection *find_collection_parent(const SceneCollection *sc_child, SceneCollection *sc_parent)
{
UNUSED_VARS(scene, sc_reinsert, sc_after);
TODO_LAYER_OPERATORS;
for (SceneCollection *sc_nested = sc_parent->scene_collections.first; sc_nested; sc_nested = sc_nested->next) {
if (sc_nested == sc_child) {
return sc_parent;
}
SceneCollection *found = find_collection_parent(sc_child, sc_nested);
if (found) {
return found;
}
}
return NULL;
}
void BKE_collection_reinsert_into(SceneCollection *sc_reinsert, SceneCollection *sc_into)
/**
* Check if \a sc_reference is nested to \a sc_parent SceneCollection
*/
static bool is_collection_in_tree(const SceneCollection *sc_reference, SceneCollection *sc_parent)
{
UNUSED_VARS(sc_reinsert, sc_into);
TODO_LAYER_OPERATORS;
return find_collection_parent(sc_reference, sc_parent) != NULL;
}
bool BKE_collection_move_above(const Scene *scene, SceneCollection *sc_dst, SceneCollection *sc_src)
{
/* Find the SceneCollection the sc_src belongs to */
SceneCollection *sc_master = BKE_collection_master(scene);
/* Master Layer can't be moved around*/
if (ELEM(sc_master, sc_src, sc_dst)) {
return false;
}
/* collection is already where we wanted it to be */
if (sc_dst->prev == sc_src) {
return false;
}
/* We can't move a collection fs the destiny collection
* is nested to the source collection */
if (is_collection_in_tree(sc_dst, sc_src)) {
return false;
}
SceneCollection *sc_src_parent = find_collection_parent(sc_src, sc_master);
SceneCollection *sc_dst_parent = find_collection_parent(sc_dst, sc_master);
BLI_assert(sc_src_parent);
BLI_assert(sc_dst_parent);
/* Remove sc_src from its parent */
BLI_remlink(&sc_src_parent->scene_collections, sc_src);
/* Re-insert it where it belongs */
BLI_insertlinkbefore(&sc_dst_parent->scene_collections, sc_dst, sc_src);
/* Update the tree */
BKE_layer_collection_resync(scene, sc_src_parent);
BKE_layer_collection_resync(scene, sc_dst_parent);
return true;
}
bool BKE_collection_move_below(const Scene *scene, SceneCollection *sc_dst, SceneCollection *sc_src)
{
/* Find the SceneCollection the sc_src belongs to */
SceneCollection *sc_master = BKE_collection_master(scene);
/* Master Layer can't be moved around*/
if (ELEM(sc_master, sc_src, sc_dst)) {
return false;
}
/* Collection is already where we wanted it to be */
if (sc_dst->next == sc_src) {
return false;
}
/* We can't move a collection if the destiny collection
* is nested to the source collection */
if (is_collection_in_tree(sc_dst, sc_src)) {
return false;
}
SceneCollection *sc_src_parent = find_collection_parent(sc_src, sc_master);
SceneCollection *sc_dst_parent = find_collection_parent(sc_dst, sc_master);
BLI_assert(sc_src_parent);
BLI_assert(sc_dst_parent);
/* Remove sc_src from its parent */
BLI_remlink(&sc_src_parent->scene_collections, sc_src);
/* Re-insert it where it belongs */
BLI_insertlinkafter(&sc_dst_parent->scene_collections, sc_dst, sc_src);
/* Update the tree */
BKE_layer_collection_resync(scene, sc_src_parent);
BKE_layer_collection_resync(scene, sc_dst_parent);
return true;
}
bool BKE_collection_move_into(const Scene *scene, SceneCollection *sc_dst, SceneCollection *sc_src)
{
/* Find the SceneCollection the sc_src belongs to */
SceneCollection *sc_master = BKE_collection_master(scene);
if (sc_src == sc_master) {
return false;
}
/* We can't move a collection if the destiny collection
* is nested to the source collection */
if (is_collection_in_tree(sc_dst, sc_src)) {
return false;
}
SceneCollection *sc_src_parent = find_collection_parent(sc_src, sc_master);
BLI_assert(sc_src_parent);
/* collection is already where we wanted it to be */
if (sc_dst->scene_collections.last == sc_src) {
return false;
}
/* Remove sc_src from it */
BLI_remlink(&sc_src_parent->scene_collections, sc_src);
/* Insert sc_src into sc_dst */
BLI_addtail(&sc_dst->scene_collections, sc_src);
/* Update the tree */
BKE_layer_collection_resync(scene, sc_src_parent);
BKE_layer_collection_resync(scene, sc_dst);
return true;
}
/* ---------------------------------------------------------------------- */

101
source/blender/blenkernel/intern/layer.c
View File

@ -533,13 +533,13 @@ static ListBase *scene_collection_listbase_find(ListBase *lb, SceneCollection *s
* Move \a lc_reinsert so that it follows \a lc_after. Both have to be stored in \a sl.
* \param lc_after: Can be NULL to reinsert \a lc_after as first collection of its own list.
*/
void BKE_layer_collection_reinsert_after(
bool BKE_layer_collection_reinsert_after(
const Scene *scene, SceneLayer *sl, LayerCollection *lc_reinsert, LayerCollection *lc_after)
{
/* TODO this function probably needs to be rewritten completely to support all cases
* (reinserting master collection, reinsert into different hierarchy levels, etc) */
TODO_LAYER_OPERATORS;
#if 0
SceneCollection *sc_master = BKE_collection_master(scene);
SceneCollection *sc_reinsert = lc_reinsert->scene_collection;
ListBase *lc_reinsert_lb = layer_collection_listbase_find(&sl->layer_collections, lc_reinsert);
@ -566,15 +566,106 @@ void BKE_layer_collection_reinsert_after(
BKE_scene_layer_base_flag_recalculate(sl);
BKE_scene_layer_engine_settings_collection_recalculate(sl, lc_reinsert);
#else
UNUSED_VARS(scene, sl, lc_reinsert, lc_after);
UNUSED_VARS(layer_collection_listbase_find, scene_collection_listbase_find);
return false;
#endif
}
void BKE_layer_collection_reinsert_into(LayerCollection *lc_reinsert, LayerCollection *lc_into)
/* ---------------------------------------------------------------------- */
/* Outliner drag and drop */
/**
* Nest a LayerCollection into another one
* Both collections must be from the same SceneLayer, return true if succeded.
*
* The LayerCollection will effectively be moved into the
* new (nested) position. So all the settings, overrides, ... go with it, and
* if the collection was directly linked to the SceneLayer it's then unlinked.
*
* For the other SceneLayers we simply resync the tree, without changing directly
* linked collections (even if they link to the same SceneCollection)
*
* \param lc_src LayerCollection to nest into \a lc_dst
* \param lc_dst LayerCollection to have \a lc_src inserted into
*/
bool BKE_layer_collection_move_into(const Scene *scene, LayerCollection *lc_src, LayerCollection *lc_dst)
{
/* TODO this is missing */
TODO_LAYER_OPERATORS;
UNUSED_VARS(lc_reinsert, lc_into);
UNUSED_VARS(scene, lc_src, lc_dst);
return false;
}
bool BKE_layer_collection_move_above(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src)
{
/* TODO this is missing */
TODO_LAYER_OPERATORS;
UNUSED_VARS(scene, lc_dst, lc_src);
return false;
}
bool BKE_layer_collection_move_below(const Scene *scene, LayerCollection *lc_dst, LayerCollection *lc_src)
{
/* TODO this is missing */
TODO_LAYER_OPERATORS;
UNUSED_VARS(scene, lc_dst, lc_src);
return false;
}
static bool layer_collection_resync(SceneLayer *sl, LayerCollection *lc, const SceneCollection *sc)
{
if (lc->scene_collection == sc) {
ListBase collections = {NULL};
BLI_movelisttolist(&collections, &lc->layer_collections);
for (SceneCollection *sc_nested = sc->scene_collections.first; sc_nested; sc_nested = sc_nested->next) {
LayerCollection *lc_nested = BLI_findptr(&collections, sc_nested, offsetof(LayerCollection, scene_collection));
if (lc_nested) {
BLI_remlink(&collections, lc_nested);
BLI_addtail(&lc->layer_collections, lc_nested);
}
else {
layer_collection_add(sl, &lc->layer_collections, sc_nested);
}
}
for (LayerCollection *lc_nested = collections.first; lc_nested; lc_nested = lc_nested->next) {
layer_collection_free(sl, lc_nested);
}
BLI_freelistN(&collections);
BLI_assert(BLI_listbase_count(&lc->layer_collections) ==
BLI_listbase_count(&sc->scene_collections));
return true;
}
for (LayerCollection *lc_nested = lc->layer_collections.first; lc_nested; lc_nested = lc_nested->next) {
if (layer_collection_resync(sl, lc_nested, sc)) {
return true;
}
}
return false;
}
/**
* Update the scene layers so that any LayerCollection that points
* to \a sc is re-synced again
*/
void BKE_layer_collection_resync(const Scene *scene, const SceneCollection *sc)
{
for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
for (LayerCollection *lc = sl->layer_collections.first; lc; lc = lc->next) {
layer_collection_resync(sl, lc, sc);
}
}
}
/* ---------------------------------------------------------------------- */
/**
* Link a collection to a renderlayer
* The collection needs to be created separately
@ -658,10 +749,10 @@ static LayerCollection *layer_collection_add(SceneLayer *sl, ListBase *lb, Scene
layer_collection_create_engine_settings(lc);
layer_collection_create_mode_settings(lc);
layer_collection_populate(sl, lc, sc);
return lc;
}
/* ---------------------------------------------------------------------- */
/**

19
source/blender/editors/space_outliner/outliner_tree.c
View File

@ -1298,21 +1298,30 @@ static void outliner_layer_collections_reorder(const Scene *scene, TreeElement *
BKE_layer_collection_reinsert_after(scene, sl, insert_coll, insert_handle_coll);
}
else if (action == TE_INSERT_INTO) {
BKE_layer_collection_reinsert_into(insert_coll, insert_handle_coll);
BKE_layer_collection_move_into(scene, insert_coll, insert_handle_coll);
}
}
static void outliner_scene_collections_reorder(const Scene *scene, TreeElement *insert_element, TreeElement *insert_handle,
TreeElementInsertType action)
{
SceneCollection *insert_coll = insert_element->directdata;
SceneCollection *insert_handle_coll = insert_handle ? insert_handle->directdata : NULL;
SceneCollection *sc_src = insert_element->directdata;
SceneCollection *sc_dst = insert_handle ? insert_handle->directdata : NULL;
if (action == TE_INSERT_AFTER) {
BKE_collection_reinsert_after(scene, insert_coll, insert_handle_coll);
if (sc_dst == NULL) {
/* It needs a SceneCollection to use as reference,
* specially now that we are to allow insert in collections
* that don't belong to the same hierarchical level*/
TODO_LAYER_OPERATORS;
/* BKE_collection_move_after(scene, sc_dst, sc_src); */
}
else {
BKE_collection_move_below(scene, sc_dst, sc_src);
}
}
else if (action == TE_INSERT_INTO) {
BKE_collection_reinsert_into(insert_coll, insert_handle_coll);
BKE_collection_move_into(scene, sc_dst, sc_src);
}
}

83
source/blender/makesrna/intern/rna_scene.c
View File

@ -2283,6 +2283,24 @@ static PointerRNA rna_SceneCollection_objects_get(CollectionPropertyIterator *it
return rna_pointer_inherit_refine(&iter->parent, &RNA_Object, ((LinkData *)internal->link)->data);
}
static int rna_SceneCollection_move_above(ID *id, SceneCollection *sc_src, SceneCollection *sc_dst)
{
Scene *scene = (Scene *)id;
return BKE_collection_move_above(scene, sc_dst, sc_src);
}
static int rna_SceneCollection_move_below(ID *id, SceneCollection *sc_src, SceneCollection *sc_dst)
{
Scene *scene = (Scene *)id;
return BKE_collection_move_below(scene, sc_dst, sc_src);
}
static int rna_SceneCollection_move_into(ID *id, SceneCollection *sc_src, SceneCollection *sc_dst)
{
Scene *scene = (Scene *)id;
return BKE_collection_move_into(scene, sc_dst, sc_src);
}
static SceneCollection *rna_SceneCollection_new(ID *id, SceneCollection *sc_parent, const char *name)
{
Scene *scene = (Scene *)id;
@ -2568,6 +2586,24 @@ static PointerRNA rna_LayerCollection_mode_settings_get(ID *UNUSED(id), LayerCol
return rna_pointer_inherit_refine(&ptr, &RNA_CollectionModeSettings, ces);
}
static int rna_LayerCollection_move_above(ID *id, LayerCollection *lc_src, LayerCollection *lc_dst)
{
Scene *scene = (Scene *)id;
return BKE_layer_collection_move_above(scene, lc_dst, lc_src);
}
static int rna_LayerCollection_move_below(ID *id, LayerCollection *lc_src, LayerCollection *lc_dst)
{
Scene *scene = (Scene *)id;
return BKE_layer_collection_move_below(scene, lc_dst, lc_src);
}
static int rna_LayerCollection_move_into(ID *id, LayerCollection *lc_src, LayerCollection *lc_dst)
{
Scene *scene = (Scene *)id;
return BKE_layer_collection_move_into(scene, lc_dst, lc_src);
}
static void rna_LayerCollection_hide_update(bContext *C, PointerRNA *ptr)
{
Scene *scene = CTX_data_scene(C);
@ -5782,6 +5818,9 @@ static void rna_def_scene_collection(BlenderRNA *brna)
StructRNA *srna;
PropertyRNA *prop;
FunctionRNA *func;
PropertyRNA *parm;
srna = RNA_def_struct(brna, "SceneCollection", NULL);
RNA_def_struct_ui_text(srna, "Scene Collection", "Collection");
@ -5814,6 +5853,28 @@ static void rna_def_scene_collection(BlenderRNA *brna)
RNA_def_property_struct_type(prop, "Object");
RNA_def_property_collection_funcs(prop, NULL, NULL, NULL, "rna_SceneCollection_objects_get", NULL, NULL, NULL, NULL);
RNA_def_property_ui_text(prop, "Filter Objects", "All the objects dynamically added to this collection via the filter");
/* Functions */
func = RNA_def_function(srna, "move_above", "rna_SceneCollection_move_above");
RNA_def_function_ui_description(func, "Move collection after another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
parm = RNA_def_pointer(func, "sc_dst", "SceneCollection", "Collection", "Reference collection above which the collection will move");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "move_below", "rna_SceneCollection_move_below");
RNA_def_function_ui_description(func, "Move collection before another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
parm = RNA_def_pointer(func, "sc_dst", "SceneCollection", "Collection", "Reference collection below which the collection will move");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "move_into", "rna_SceneCollection_move_into");
RNA_def_function_ui_description(func, "Move collection into another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
parm = RNA_def_pointer(func, "sc_dst", "SceneCollection", "Collection", "Collection to insert into");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
}
static void rna_def_layer_collection_override(BlenderRNA *brna)
@ -6118,6 +6179,7 @@ static void rna_def_layer_collection(BlenderRNA *brna)
RNA_def_property_struct_type(prop, "LayerCollectionOverride");
RNA_def_property_ui_text(prop, "Collection Overrides", "");
/* Functions */
func = RNA_def_function(srna, "get_engine_settings", "rna_LayerCollection_engine_settings_get");
RNA_def_function_ui_description(func, "Return the engine settings for this collection");
RNA_def_function_flag(func, FUNC_USE_SELF_ID | FUNC_USE_CONTEXT);
@ -6136,6 +6198,27 @@ static void rna_def_layer_collection(BlenderRNA *brna)
RNA_def_parameter_flags(parm, 0, PARM_RNAPTR);
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "move_above", "rna_LayerCollection_move_above");
RNA_def_function_ui_description(func, "Move collection after another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
parm = RNA_def_pointer(func, "lc_dst", "LayerCollection", "Collection", "Reference collection above which the collection will move");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "move_below", "rna_LayerCollection_move_below");
RNA_def_function_ui_description(func, "Move collection before another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
parm = RNA_def_pointer(func, "lc_dst", "LayerCollection", "Collection", "Reference collection below which the collection will move");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
func = RNA_def_function(srna, "move_into", "rna_LayerCollection_move_into");
RNA_def_function_ui_description(func, "Move collection into another");
RNA_def_function_flag(func, FUNC_USE_SELF_ID);
parm = RNA_def_pointer(func, "lc_dst", "LayerCollection", "Collection", "Collection to insert into");
parm = RNA_def_boolean(func, "result", false, "Result", "Whether the operation succeded");
RNA_def_function_return(func, parm);
/* Flags */
prop = RNA_def_property(srna, "hide", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", COLLECTION_VISIBLE);

42
tests/python/render_layer/CMakeLists.txt
View File

@ -72,6 +72,48 @@ RENDER_LAYER_TEST(object_link_a)
RENDER_LAYER_TEST(object_link_b)
RENDER_LAYER_TEST(object_link_c)
RENDER_LAYER_TEST(operator_context)
RENDER_LAYER_TEST(move_above_below_scene_collection_a)
RENDER_LAYER_TEST(move_above_below_scene_collection_b)
RENDER_LAYER_TEST(move_above_below_scene_collection_c)
RENDER_LAYER_TEST(move_above_below_scene_collection_d)
RENDER_LAYER_TEST(move_above_below_scene_collection_e)
RENDER_LAYER_TEST(move_above_below_scene_collection_f)
RENDER_LAYER_TEST(move_above_below_scene_collection_g)
RENDER_LAYER_TEST(move_above_below_scene_collection_h)
RENDER_LAYER_TEST(move_above_below_scene_collection_i)
RENDER_LAYER_TEST(move_above_below_scene_collection_sync_a)
RENDER_LAYER_TEST(move_above_below_scene_collection_sync_b)
RENDER_LAYER_TEST(move_above_below_scene_collection_sync_c)
RENDER_LAYER_TEST(move_above_below_scene_collection_sync_d)
RENDER_LAYER_TEST(move_above_below_scene_collection_sync_e)
RENDER_LAYER_TEST(move_above_below_scene_collection_sync_f)
RENDER_LAYER_TEST(move_above_below_scene_collection_sync_g)
RENDER_LAYER_TEST(move_above_below_scene_collection_sync_h)
RENDER_LAYER_TEST(move_above_below_scene_collection_sync_i)
RENDER_LAYER_TEST(move_into_scene_collection_a)
RENDER_LAYER_TEST(move_into_scene_collection_b)
RENDER_LAYER_TEST(move_into_scene_collection_c)
RENDER_LAYER_TEST(move_into_scene_collection_d)
RENDER_LAYER_TEST(move_into_scene_collection_e)
RENDER_LAYER_TEST(move_into_scene_collection_f)
RENDER_LAYER_TEST(move_into_scene_collection_g)
RENDER_LAYER_TEST(move_into_scene_collection_h)
RENDER_LAYER_TEST(move_into_scene_collection_i)
RENDER_LAYER_TEST(move_into_scene_collection_j)
RENDER_LAYER_TEST(move_into_scene_collection_k)
RENDER_LAYER_TEST(move_into_scene_collection_l)
RENDER_LAYER_TEST(move_into_scene_collection_sync_a)
RENDER_LAYER_TEST(move_into_scene_collection_sync_b)
RENDER_LAYER_TEST(move_into_scene_collection_sync_c)
RENDER_LAYER_TEST(move_into_scene_collection_sync_d)
RENDER_LAYER_TEST(move_into_scene_collection_sync_e)
RENDER_LAYER_TEST(move_into_scene_collection_sync_f)
RENDER_LAYER_TEST(move_into_scene_collection_sync_g)
RENDER_LAYER_TEST(move_into_scene_collection_sync_h)
RENDER_LAYER_TEST(move_into_scene_collection_sync_i)
RENDER_LAYER_TEST(move_into_scene_collection_sync_j)
RENDER_LAYER_TEST(move_into_scene_collection_sync_k)
RENDER_LAYER_TEST(move_into_scene_collection_sync_l)
RENDER_LAYER_TEST(layer_linking)
RENDER_LAYER_TEST(layer_syncinc)
RENDER_LAYER_TEST(scene_copy)

173
tests/python/render_layer/render_layer_common.py
View File

@ -342,3 +342,176 @@ class RenderLayerTesting(unittest.TestCase):
self.assertEqual(master_collection, bpy.context.scene.master_collection)
master_collection.objects.link(bpy.data.objects.new('object', None))
def cleanup_tree(self):
"""
Remove any existent layer and collections,
leaving only the one render_layer we can't remove
"""
import bpy
scene = bpy.context.scene
while len(scene.render_layers) > 1:
scene.render_layers.remove(scene.render_layers[1])
layer = scene.render_layers[0]
while layer.collections:
layer.collections.unlink(layer.collections[0])
master_collection = scene.master_collection
while master_collection.collections:
master_collection.collections.remove(master_collection.collections[0])
class MoveSceneCollectionTesting(RenderLayerTesting):
"""
To be used by tests of render_layer_move_into_scene_collection
"""
def get_initial_scene_tree_map(self):
collections_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['cat', None],
]],
]],
]
return collections_map
def build_scene_tree(self, tree_map, collection=None, ret_dict=None):
"""
Returns a flat dictionary with new scene collections
created from a nested tuple of nested tuples (name, tuple)
"""
import bpy
if collection is None:
collection = bpy.context.scene.master_collection
if ret_dict is None:
ret_dict = {collection.name: collection}
self.assertEqual(collection.name, "Master Collection")
for name, nested_collections in tree_map:
new_collection = collection.collections.new(name)
ret_dict[name] = new_collection
if nested_collections:
self.build_scene_tree(nested_collections, new_collection, ret_dict)
return ret_dict
def setup_tree(self):
"""
Cleanup file, and populate it with class scene tree map
"""
self.cleanup_tree()
self.assertTrue(hasattr(self, "get_initial_scene_tree_map"), "Test class has no get_initial_scene_tree_map method implemented")
return self.build_scene_tree(self.get_initial_scene_tree_map())
def get_scene_tree_map(self, collection=None, ret_list=None):
"""
Extract the scene collection tree from scene
Return as a nested list of nested lists (name, list)
"""
import bpy
if collection is None:
scene = bpy.context.scene
collection = scene.master_collection
if ret_list is None:
ret_list = []
for nested_collection in collection.collections:
new_collection = [nested_collection.name, None]
ret_list.append(new_collection)
if nested_collection.collections:
new_collection[1] = list()
self.get_scene_tree_map(nested_collection, new_collection[1])
return ret_list
def compare_tree_maps(self):
"""
Compare scene with expected (class defined) data
"""
self.assertEqual(self.get_scene_tree_map(), self.get_reference_scene_tree_map())
class MoveSceneCollectionSyncTesting(MoveSceneCollectionTesting):
"""
To be used by tests of render_layer_move_into_scene_collection_sync
"""
def get_initial_layers_tree_map(self):
layers_map = [
['Layer 1', [
'Master Collection',
'C',
'3',
]],
['Layer 2', [
'C',
'3',
'dog',
'cat',
]],
]
return layers_map
def setup_tree(self):
tree = super(MoveSceneCollectionSyncTesting, self).setup_tree()
import bpy
scene = bpy.context.scene
self.assertTrue(hasattr(self, "get_initial_layers_tree_map"), "Test class has no get_initial_layers_tree_map method implemented")
layers_map = self.get_initial_layers_tree_map()
for layer_name, collections_names in layers_map:
layer = scene.render_layers.new(layer_name)
layer.collections.unlink(layer.collections[0])
for collection_name in collections_names:
layer.collections.link(tree[collection_name])
return tree
def compare_tree_maps(self):
"""
Compare scene with expected (class defined) data
"""
super(MoveSceneCollectionSyncTesting, self).compare_tree_maps()
import bpy
scene = bpy.context.scene
layers_map = self.get_initial_layers_tree_map()
for layer_name, collections_names in layers_map:
layer = scene.render_layers.get(layer_name)
self.assertTrue(layer)
self.assertEqual(len(collections_names), len(layer.collections))
for i, collection_name in enumerate(collections_names):
self.assertEqual(collection_name, layer.collections[i].name)
self.verify_collection_tree(layer.collections[i])
def verify_collection_tree(self, layer_collection):
"""
Check if the LayerCollection mimics the SceneLayer tree
"""
scene_collection = layer_collection.collection
self.assertEqual(len(layer_collection.collections), len(scene_collection.collections))
for i, nested_collection in enumerate(layer_collection.collections):
self.assertEqual(nested_collection.collection.name, scene_collection.collections[i].name)
self.assertEqual(nested_collection.collection, scene_collection.collections[i])
self.verify_collection_tree(nested_collection)

88
tests/python/render_layer/test_move_above_below_scene_collection_a.py Normal file
View File

@ -0,0 +1,88 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['cat'].move_above(tree['dog']))
self.assertTrue(tree['dog'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['dog'].move_below(tree['cat']))
self.assertTrue(tree['cat'].move_below(tree['dog']))
self.compare_tree_maps()
def test_scene_collection_move_c(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['dog'].move_below(tree['cat']))
self.assertTrue(tree['dog'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_d(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['cat'].move_above(tree['dog']))
self.assertTrue(tree['cat'].move_below(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

77
tests/python/render_layer/test_move_above_below_scene_collection_b.py Normal file
View File

@ -0,0 +1,77 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', None],
['C', [
['3', [
['dog', None],
['cat', None],
]],
['1', None],
['2', None],
]],
]
return reference_tree_map
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['3'].move_above(tree['1']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['1'].move_below(tree['3']))
self.assertTrue(tree['2'].move_below(tree['1']))
self.compare_tree_maps()
def test_scene_collection_move_c(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['3'].move_above(tree['2']))
self.assertTrue(tree['1'].move_above(tree['2']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

59
tests/python/render_layer/test_move_above_below_scene_collection_c.py Normal file
View File

@ -0,0 +1,59 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['3', [
['dog', None],
['cat', None],
]],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
]],
]
return reference_tree_map
def test_scene_collection_move(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['3'].move_below(tree['ii']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

68
tests/python/render_layer/test_move_above_below_scene_collection_d.py Normal file
View File

@ -0,0 +1,68 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['B', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['B'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['B'].move_below(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

68
tests/python/render_layer/test_move_above_below_scene_collection_e.py Normal file
View File

@ -0,0 +1,68 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
reference_tree_map = [
['A', [
['i', None],
['ii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['iii', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['iii'].move_below(tree['dog']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['iii'].move_above(tree['cat']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

59
tests/python/render_layer/test_move_above_below_scene_collection_f.py Normal file
View File

@ -0,0 +1,59 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['dog', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_move(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['A'].move_above(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

52
tests/python/render_layer/test_move_above_below_scene_collection_g.py Normal file
View File

@ -0,0 +1,52 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['dog'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['cat'].move_below(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

92
tests/python/render_layer/test_move_above_below_scene_collection_h.py Normal file
View File

@ -0,0 +1,92 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(master_collection.move_above(collection))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(master_collection.move_below(collection))
self.compare_tree_maps()
def test_scene_collection_move_c(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(collection.move_above(master_collection))
self.compare_tree_maps()
def test_scene_collection_move_d(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(collection.move_below(master_collection))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

68
tests/python/render_layer/test_move_above_below_scene_collection_i.py Normal file
View File

@ -0,0 +1,68 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_above(tree['2']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_below(tree['2']))
self.compare_tree_maps()
def test_scene_collection_move_c(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_d(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_below(tree['cat']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

88
tests/python/render_layer/test_move_above_below_scene_collection_sync_a.py Normal file
View File

@ -0,0 +1,88 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['cat'].move_above(tree['dog']))
self.assertTrue(tree['dog'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['dog'].move_below(tree['cat']))
self.assertTrue(tree['cat'].move_below(tree['dog']))
self.compare_tree_maps()
def test_scene_collection_move_c(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['dog'].move_below(tree['cat']))
self.assertTrue(tree['dog'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_d(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['cat'].move_above(tree['dog']))
self.assertTrue(tree['cat'].move_below(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

77
tests/python/render_layer/test_move_above_below_scene_collection_sync_b.py Normal file
View File

@ -0,0 +1,77 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', None],
['C', [
['3', [
['dog', None],
['cat', None],
]],
['1', None],
['2', None],
]],
]
return reference_tree_map
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['3'].move_above(tree['1']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['1'].move_below(tree['3']))
self.assertTrue(tree['2'].move_below(tree['1']))
self.compare_tree_maps()
def test_scene_collection_move_c(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['3'].move_above(tree['2']))
self.assertTrue(tree['1'].move_above(tree['2']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

59
tests/python/render_layer/test_move_above_below_scene_collection_sync_c.py Normal file
View File

@ -0,0 +1,59 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['3', [
['dog', None],
['cat', None],
]],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
]],
]
return reference_tree_map
def test_scene_collection_move(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['3'].move_below(tree['ii']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

68
tests/python/render_layer/test_move_above_below_scene_collection_sync_d.py Normal file
View File

@ -0,0 +1,68 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['B', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['B'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['B'].move_below(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

68
tests/python/render_layer/test_move_above_below_scene_collection_sync_e.py Normal file
View File

@ -0,0 +1,68 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
reference_tree_map = [
['A', [
['i', None],
['ii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['iii', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['iii'].move_below(tree['dog']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['iii'].move_above(tree['cat']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

59
tests/python/render_layer/test_move_above_below_scene_collection_sync_f.py Normal file
View File

@ -0,0 +1,59 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['dog', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_move(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['A'].move_above(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

52
tests/python/render_layer/test_move_above_below_scene_collection_sync_g.py Normal file
View File

@ -0,0 +1,52 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['dog'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['cat'].move_below(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

92
tests/python/render_layer/test_move_above_below_scene_collection_sync_h.py Normal file
View File

@ -0,0 +1,92 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(master_collection.move_above(collection))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(master_collection.move_below(collection))
self.compare_tree_maps()
def test_scene_collection_move_c(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(collection.move_above(master_collection))
self.compare_tree_maps()
def test_scene_collection_move_d(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(collection.move_below(master_collection))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

68
tests/python/render_layer/test_move_above_below_scene_collection_sync_i.py Normal file
View File

@ -0,0 +1,68 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_move_a(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_above(tree['2']))
self.compare_tree_maps()
def test_scene_collection_move_b(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_below(tree['2']))
self.compare_tree_maps()
def test_scene_collection_move_c(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_above(tree['cat']))
self.compare_tree_maps()
def test_scene_collection_move_d(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_below(tree['cat']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

61
tests/python/render_layer/test_move_into_scene_collection_a.py Normal file
View File

@ -0,0 +1,61 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['cat'].move_into(tree['2']))
self.assertTrue(tree['cat'].move_into(tree['3']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_b.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', [
['3', [
['dog', None],
['cat', None],
]],
]],
['C', [
['1', None],
['2', None],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['3'].move_into(tree['B']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_c.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', [
['cat', None],
]],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['cat'].move_into(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

45
tests/python/render_layer/test_move_into_scene_collection_d.py Normal file
View File

@ -0,0 +1,45 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
# can't move into a collection if already the last item of the collection
self.assertFalse(tree['cat'].move_into(tree['3']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_e.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['cat', [
['B', None],
]],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['B'].move_into(tree['cat']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

59
tests/python/render_layer/test_move_into_scene_collection_f.py Normal file
View File

@ -0,0 +1,59 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['cat', None],
['B', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['B'].move_into(tree['3']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_g.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
]],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['A'].move_into(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_h.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', [
['ii', None],
]],
['3', [
['dog', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['ii'].move_into(tree['2']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_i.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', [
['ii', None],
]],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['ii'].move_into(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

51
tests/python/render_layer/test_move_into_scene_collection_j.py Normal file
View File

@ -0,0 +1,51 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_into(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(master_collection.move_into(collection))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

44
tests/python/render_layer/test_move_into_scene_collection_k.py Normal file
View File

@ -0,0 +1,44 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_into(tree['2']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

44
tests/python/render_layer/test_move_into_scene_collection_l.py Normal file
View File

@ -0,0 +1,44 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_into(tree['cat']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

45
tests/python/render_layer/test_move_into_scene_collection_sync_a.py Normal file
View File

@ -0,0 +1,45 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['cat'].move_into(tree['2']))
self.assertTrue(tree['cat'].move_into(tree['3']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_sync_b.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', [
['3', [
['dog', None],
['cat', None],
]],
]],
['C', [
['1', None],
['2', None],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['3'].move_into(tree['B']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_sync_c.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', [
['cat', None],
]],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['cat'].move_into(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

45
tests/python/render_layer/test_move_into_scene_collection_sync_d.py Normal file
View File

@ -0,0 +1,45 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
# can't move into a collection if already the last item of the collection
self.assertFalse(tree['cat'].move_into(tree['3']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_sync_e.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['cat', [
['B', None],
]],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['B'].move_into(tree['cat']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

59
tests/python/render_layer/test_move_into_scene_collection_sync_f.py Normal file
View File

@ -0,0 +1,59 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
['C', [
['1', None],
['2', None],
['3', [
['dog', None],
['cat', None],
['B', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['B'].move_into(tree['3']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_sync_g.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', [
['A', [
['i', None],
['ii', None],
['iii', None],
]],
]],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['A'].move_into(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_sync_h.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', [
['ii', None],
]],
['3', [
['dog', None],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['ii'].move_into(tree['2']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

60
tests/python/render_layer/test_move_into_scene_collection_sync_i.py Normal file
View File

@ -0,0 +1,60 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
reference_tree_map = [
['A', [
['i', None],
['iii', None],
]],
['B', None],
['C', [
['1', None],
['2', None],
['3', [
['dog', [
['ii', None],
]],
['cat', None],
]],
]],
]
return reference_tree_map
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertTrue(tree['ii'].move_into(tree['dog']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

51
tests/python/render_layer/test_move_into_scene_collection_sync_j.py Normal file
View File

@ -0,0 +1,51 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_into(self):
"""
Test outliner operations
"""
import bpy
master_collection = bpy.context.scene.master_collection
tree = self.setup_tree()
for collection in tree.values():
# can't move into master_collection anywhere
self.assertFalse(master_collection.move_into(collection))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

44
tests/python/render_layer/test_move_into_scene_collection_sync_k.py Normal file
View File

@ -0,0 +1,44 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_into(tree['2']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()

44
tests/python/render_layer/test_move_into_scene_collection_sync_l.py Normal file
View File

@ -0,0 +1,44 @@
# ./blender.bin --background -noaudio --python tests/python/render_layer/test_link.py -- --testdir="/data/lib/tests/"
# ############################################################
# Importing - Same For All Render Layer Tests
# ############################################################
import unittest
import os, sys
sys.path.append(os.path.dirname(__file__))
from render_layer_common import *
# ############################################################
# Testing
# ############################################################
class UnitTesting(MoveSceneCollectionSyncTesting):
def get_reference_scene_tree_map(self):
# original tree, no changes
return self.get_initial_scene_tree_map()
def test_scene_collection_into(self):
"""
Test outliner operations
"""
tree = self.setup_tree()
self.assertFalse(tree['C'].move_into(tree['cat']))
self.compare_tree_maps()
# ############################################################
# Main - Same For All Render Layer Tests
# ############################################################
if __name__ == '__main__':
import sys
extra_arguments = sys.argv[sys.argv.index("--") + 1:] if "--" in sys.argv else []
sys.argv = [__file__] + (sys.argv[sys.argv.index("--") + 2:] if "--" in sys.argv else [])
UnitTesting._extra_arguments = extra_arguments
unittest.main()