[Bf-blender-cvs] [bd119ab0177] blender2.8: Depsgraph: Expose query to get view layer to RNA

Dalai Felinto noreply at git.blender.org
Tue Feb 27 22:26:07 CET 2018


Commit: bd119ab0177a380a1736677278c02790d8235be4
Author: Dalai Felinto
Date:   Fri Feb 23 09:22:35 2018 -0300
Branches: blender2.8
https://developer.blender.org/rBbd119ab0177a380a1736677278c02790d8235be4

Depsgraph: Expose query to get view layer to RNA

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

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

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

diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index e6e1c714008..bb20fcb271f 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -34,10 +34,11 @@
 
 #include "rna_internal.h"
 
-#include "DEG_depsgraph.h"
-
 #include "DNA_object_types.h"
 
+#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
+
 #define STATS_MAX_SIZE 16384
 
 #ifdef RNA_RUNTIME
@@ -240,6 +241,13 @@ static ID *rna_Depsgraph_evaluated_id_get(Depsgraph *depsgraph, ID *id_orig)
 	return DEG_get_evaluated_id(depsgraph, id_orig);
 }
 
+static PointerRNA rna_Depsgraph_view_layer_get(PointerRNA *ptr)
+{
+	Depsgraph *depsgraph = (Depsgraph *)ptr->data;
+	ViewLayer *view_layer = DEG_get_evaluated_view_layer(depsgraph);
+	return rna_pointer_inherit_refine(ptr, &RNA_ViewLayer, view_layer);
+}
+
 #else
 
 static void rna_def_depsgraph_iter(BlenderRNA *brna)
@@ -358,6 +366,11 @@ static void rna_def_depsgraph(BlenderRNA *brna)
 	                                  "rna_Depsgraph_duplis_end",
 	                                  "rna_Depsgraph_duplis_get",
 	                                  NULL, NULL, NULL, NULL);
+
+	prop = RNA_def_property(srna, "view_layer", PROP_POINTER, PROP_NONE);
+	RNA_def_property_struct_type(prop, "ViewLayer");
+	RNA_def_property_pointer_funcs(prop, "rna_Depsgraph_view_layer_get", NULL, NULL, NULL);
+	RNA_def_property_ui_text(prop, "Scene layer", "");
 }
 
 void RNA_def_depsgraph(BlenderRNA *brna)



More information about the Bf-blender-cvs mailing list