[Bf-blender-cvs] [e95110c3da7] temp-group-collections: RNA: fixup for allow for enable/disable group collections

Dalai Felinto noreply at git.blender.org
Wed Nov 1 18:15:02 CET 2017


Commit: e95110c3da7a5bd5968748776a25f46e77696b91
Author: Dalai Felinto
Date:   Tue Oct 31 19:19:30 2017 -0200
Branches: temp-group-collections
https://developer.blender.org/rBe95110c3da7a5bd5968748776a25f46e77696b91

RNA: fixup for allow for enable/disable group collections

===================================================================

M	source/blender/makesrna/intern/rna_layer.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c
index 3f5e330b5d5..5fd104104ff 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -125,9 +125,7 @@ static PointerRNA rna_SceneCollection_objects_get(CollectionPropertyIterator *it
 
 static int rna_SceneCollection_move_above(ID *id, SceneCollection *sc_src, Main *bmain, SceneCollection *sc_dst)
 {
-	Scene *scene = (Scene *)id;
-
-	if (!BKE_collection_move_above(scene, sc_dst, sc_src)) {
+	if (!BKE_collection_move_above(id, sc_dst, sc_src)) {
 		return 0;
 	}
 
@@ -139,9 +137,7 @@ static int rna_SceneCollection_move_above(ID *id, SceneCollection *sc_src, Main
 
 static int rna_SceneCollection_move_below(ID *id, SceneCollection *sc_src, Main *bmain, SceneCollection *sc_dst)
 {
-	Scene *scene = (Scene *)id;
-
-	if (!BKE_collection_move_below(scene, sc_dst, sc_src)) {
+	if (!BKE_collection_move_below(id, sc_dst, sc_src)) {
 		return 0;
 	}
 
@@ -153,9 +149,7 @@ static int rna_SceneCollection_move_below(ID *id, SceneCollection *sc_src, Main
 
 static int rna_SceneCollection_move_into(ID *id, SceneCollection *sc_src, Main *bmain, SceneCollection *sc_dst)
 {
-	Scene *scene = (Scene *)id;
-
-	if (!BKE_collection_move_into(scene, sc_dst, sc_src)) {
+	if (!BKE_collection_move_into(id, sc_dst, sc_src)) {
 		return 0;
 	}



More information about the Bf-blender-cvs mailing list