[Bf-blender-cvs] [e20ec83765d] temp-dynamic-overrides: Fixup for LinkData > AffectedCollection

Dalai Felinto noreply at git.blender.org
Mon May 28 21:56:50 CEST 2018


Commit: e20ec83765dc559fd8b3a32c8d254c621d0e25d0
Author: Dalai Felinto
Date:   Mon May 28 01:58:27 2018 +0200
Branches: temp-dynamic-overrides
https://developer.blender.org/rBe20ec83765dc559fd8b3a32c8d254c621d0e25d0

Fixup for LinkData > AffectedCollection

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

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 ac4a3ac7268..574a91d850e 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -191,13 +191,13 @@ static void rna_ObjectBase_select_update(Main *UNUSED(bmain), Scene *UNUSED(scen
 
 static void rna_OverriddenCollection_name_get(PointerRNA *ptr, char *value)
 {
-	Collection *collection = ((LinkData *)ptr->data)->data;
+	Collection *collection = ((AffectedCollection *)ptr->data)->collection;
 	strcpy(value, collection->id.name + 2);
 }
 
 static int rna_OverriddenCollection_name_length(PointerRNA *ptr)
 {
-	Collection *collection = ((LinkData *)ptr->data)->data;
+	Collection *collection = ((AffectedCollection *)ptr->data)->collection;
 	return strnlen(collection->id.name + 2, sizeof(collection->id.name));
 }



More information about the Bf-blender-cvs mailing list