[Bf-blender-cvs] [96490f08269] temp-group-collections: RNA: allow for enable/disable of group collections
Dalai Felinto
noreply at git.blender.org
Wed Nov 1 18:14:55 CET 2017
Commit: 96490f082699b755b7699730d97280d01e9b5325
Author: Dalai Felinto
Date: Mon Oct 30 20:20:47 2017 -0200
Branches: temp-group-collections
https://developer.blender.org/rB96490f082699b755b7699730d97280d01e9b5325
RNA: allow for enable/disable of 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 35159b91049..b36c08819b4 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -716,8 +716,16 @@ static void rna_LayerCollection_flag_update(bContext *C, PointerRNA *UNUSED(ptr)
static void rna_LayerCollection_enable_set(
ID *id, LayerCollection *layer_collection, Main *bmain, bContext *C, ReportList *reports, int value)
{
- Scene *scene = (Scene *)id;
- SceneLayer *scene_layer = BKE_scene_layer_find_from_collection(scene, layer_collection);
+ SceneLayer *scene_layer;
+ if (GS(id->name) == ID_SCE) {
+ Scene *scene = (Scene *)id;
+ scene_layer = BKE_scene_layer_find_from_collection(scene, layer_collection);
+ }
+ else {
+ BLI_assert(GS(id->name) == ID_GR);
+ Group *group = (Group *)id;
+ scene_layer = group->scene_layer;
+ }
if (layer_collection->flag & COLLECTION_DISABLED) {
if (value == 1) {
@@ -739,6 +747,7 @@ static void rna_LayerCollection_enable_set(
}
}
+ Scene *scene = CTX_data_scene(C);
DEG_relations_tag_update(bmain);
/* TODO(sergey): Use proper flag for tagging here. */
DEG_id_tag_update(&scene->id, 0);
More information about the Bf-blender-cvs
mailing list