Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2017-03-10 15:59:03 +0300
committerJulian Eisel <eiseljulian@gmail.com>2017-03-10 15:59:03 +0300
commitc70eb873057b8856fc978291c6241dc43cdf3a80 (patch)
treeb264b0edb66147db82f9436b247d691922be552d /source/blender/editors/space_outliner/outliner_tree.c
parent6a8cb924049be6b16fad78754b480c93617f5384 (diff)
Fix issues in outliner collection reordering function
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_tree.c')
-rw-r--r--source/blender/editors/space_outliner/outliner_tree.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/space_outliner/outliner_tree.c b/source/blender/editors/space_outliner/outliner_tree.c
index 870c34a1ee7..1273a9fd1f6 100644
--- a/source/blender/editors/space_outliner/outliner_tree.c
+++ b/source/blender/editors/space_outliner/outliner_tree.c
@@ -1290,11 +1290,11 @@ static void outliner_add_orphaned_datablocks(Main *mainvar, SpaceOops *soops)
static void outliner_layer_collections_reorder(const Scene *scene, TreeElement *insert_element, TreeElement *insert_handle,
TreeElementInsertType action)
{
- LayerCollection *sc_src = insert_element->directdata;
- LayerCollection *sc_dst = insert_handle ? insert_handle->directdata : NULL;
+ LayerCollection *lc_src = insert_element->directdata;
+ LayerCollection *lc_dst = insert_handle ? insert_handle->directdata : NULL;
if (action == TE_INSERT_AFTER) {
- if (sc_dst == NULL) {
+ if (lc_dst == NULL) {
/* It needs a LayerCollection to use as reference,
* specially now that we are to allow insert in collections
* that don't belong to the same hierarchical level */
@@ -1302,11 +1302,11 @@ static void outliner_layer_collections_reorder(const Scene *scene, TreeElement *
/* BKE_layer_collection_move_after(scene, sc_dst, sc_src); */
}
else {
- BKE_layer_collection_move_below(scene, sc_dst, sc_src);
+ BKE_layer_collection_move_below(scene, lc_dst, lc_src);
}
}
else if (action == TE_INSERT_INTO) {
- BKE_layer_collection_move_into(scene, sc_src, sc_dst);
+ BKE_layer_collection_move_into(scene, lc_dst, lc_src);
}
}