Commit: b06deeca25a6fd851ae9fafa4278e077a874d96a
Author: Bastien Montagne
Date: Tue Jun 12 10:55:29 2018 +0200
Branches: temp-dynamic-overrides
https://developer.blender.org/rBb06deeca25a6fd851ae9fafa4278e077a874d96a
Merge branch 'blender2.8' into temp-dynamic-overrides
Conflicts:
source/blender/makesrna/intern/rna_access.c
===================================================================
===================================================================
diff --cc source/blender/makesrna/intern/rna_access.c
index b6f7d28d8e4,0532aac1bc3..c58becf8ead
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@@ -4689,21 -4677,8 +4694,21 @@@ static bool rna_path_parse(PointerRNA *
* or explicitly requested
*/
if (eval_pointer || *path) {
- PointerRNA nextptr =
RNA_property_pointer_get(&curptr, prop);
+ PointerRNA nextptr;
+ if (do_type_only) {
+ StructRNA *nexttype =
RNA_property_pointer_type(&curptr, prop);
+ if (nexttype !=
&RNA_UnknownType) {
+
RNA_pointer_create(NULL, nexttype, NULL, &nextptr);
+ }
+ else {
+ /* We cannot go
further... */
+ break;
+ }
+ }
+ else {
+ nextptr =
RNA_property_pointer_get(&curptr, prop);
+ }
-
+
curptr = nextptr;
prop = NULL; /* now we have a
PointerRNA, the prop is our parent so forget it */
index = -1;
diff --cc source/blender/makesrna/intern/rna_object.c
index 5c33a01c9e5,f74651f35f2..b7cf0404bd3
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@@ -1843,7 -1840,6 +1851,7 @@@ static void rna_def_object_display(Blen
RNA_def_property_boolean_sdna(prop, NULL, "flag", OB_SHOW_SHADOW);
RNA_def_property_boolean_default(prop, true);
RNA_def_property_ui_text(prop, "Shadow", "Object cast shadows in the 3d
viewport");
- RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
++ RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
}
@@@ -2247,13 -2249,11 +2261,13 @@@ static void rna_def_object(BlenderRNA *
prop = RNA_def_property(srna, "pass_index", PROP_INT, PROP_UNSIGNED);
RNA_def_property_int_sdna(prop, NULL, "index");
RNA_def_property_ui_text(prop, "Pass Index", "Index number for the
\"Object Index\" render pass");
- RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
++ RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
RNA_def_property_update(prop, NC_OBJECT,
"rna_Object_internal_update_draw");
-
+
prop = RNA_def_property(srna, "color", PROP_FLOAT, PROP_COLOR);
RNA_def_property_float_sdna(prop, NULL, "col");
RNA_def_property_ui_text(prop, "Color", "Object color and alpha, used
when faces have the ObColor mode enabled");
- RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
++ RNA_def_property_override_flag(prop, PROPOVERRIDE_OVERRIDABLE_STATIC);
RNA_def_property_update(prop, NC_OBJECT | ND_DRAW, NULL);
/* physics */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
