Commit: a5454e8711c8b9728a4f7523bf92de60b945357a
Author: Bastien Montagne
Date: Fri Dec 1 17:33:56 2017 +0100
Branches: blender2.8
https://developer.blender.org/rBa5454e8711c8b9728a4f7523bf92de60b945357a
Cleanup: forgot to rename RNA prop flag to override_static...
===================================================================
M source/blender/makesrna/RNA_types.h
M source/blender/makesrna/intern/rna_access.c
M source/blender/makesrna/intern/rna_animation.c
M source/blender/makesrna/intern/rna_image.c
M source/blender/makesrna/intern/rna_modifier.c
M source/blender/makesrna/intern/rna_object.c
M source/blender/makesrna/intern/rna_pose.c
M source/blender/makesrna/intern/rna_rna.c
===================================================================
diff --git a/source/blender/makesrna/RNA_types.h
b/source/blender/makesrna/RNA_types.h
index a3bba1984c1..47aebbc13e7 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -177,7 +177,7 @@ typedef enum PropertyFlag {
PROP_ANIMATABLE = (1 << 1),
/* Means the property can be overriden by a local 'proxy' of some
linked datablock. */
- PROP_OVERRIDABLE = (1 << 2),
+ PROP_OVERRIDABLE_STATIC = (1 << 2),
/* This flag means when the property's widget is in 'textedit' mode, it
will be updated
* after every typed char, instead of waiting final validation. Used
e.g. for text searchbox.
diff --git a/source/blender/makesrna/intern/rna_access.c
b/source/blender/makesrna/intern/rna_access.c
index a1f059a9487..0b623bc9003 100644
--- a/source/blender/makesrna/intern/rna_access.c
+++ b/source/blender/makesrna/intern/rna_access.c
@@ -1819,7 +1819,7 @@ bool RNA_property_editable(PointerRNA *ptr, PropertyRNA
*prop)
return ((flag & PROP_EDITABLE) &&
(flag & PROP_REGISTER) == 0 &&
(!id || ((!ID_IS_LINKED(id) || (prop->flag &
PROP_LIB_EXCEPTION)) &&
- (!id->override_static || (prop->flag &
PROP_OVERRIDABLE)))));
+ (!id->override_static || (prop->flag &
PROP_OVERRIDABLE_STATIC)))));
}
/**
@@ -1852,7 +1852,7 @@ bool RNA_property_editable_info(PointerRNA *ptr,
PropertyRNA *prop, const char *
}
return false;
}
- if (id->override_static != NULL && (prop->flag &
PROP_OVERRIDABLE) == 0) {
+ if (id->override_static != NULL && (prop->flag &
PROP_OVERRIDABLE_STATIC) == 0) {
if (!(*r_info)[0]) {
*r_info = "Can't edit this property from an
override data-block.";
}
@@ -7247,7 +7247,7 @@ bool RNA_struct_override_matches(
for (; iter.valid; RNA_property_collection_next(&iter)) {
PropertyRNA *prop = iter.ptr.data;
- if (ignore_non_overridable && !(prop->flag & PROP_OVERRIDABLE))
{
+ if (ignore_non_overridable && !(prop->flag &
PROP_OVERRIDABLE_STATIC)) {
continue;
}
@@ -7391,7 +7391,7 @@ bool RNA_struct_auto_override(PointerRNA *local,
PointerRNA *reference, IDOverri
for (RNA_property_collection_begin(local, iterprop, &iter); iter.valid;
RNA_property_collection_next(&iter)) {
PropertyRNA *prop = iter.ptr.data;
- if (!(prop->flag & PROP_OVERRIDABLE)) {
+ if (!(prop->flag & PROP_OVERRIDABLE_STATIC)) {
continue;
}
if (RNA_property_animated(local, prop)) {
@@ -7506,7 +7506,7 @@ void RNA_property_override_status(
return;
}
- SET_RET(r_overridable, (prop->flag & PROP_OVERRIDABLE) && (prop->flag &
PROP_EDITABLE));
+ SET_RET(r_overridable, (prop->flag & PROP_OVERRIDABLE_STATIC) &&
(prop->flag & PROP_EDITABLE));
if (r_overridden || r_mandatory || r_locked) {
IDOverrideStaticPropertyOperation *opop =
RNA_property_override_property_operation_find(ptr, prop, index, false, NULL);
diff --git a/source/blender/makesrna/intern/rna_animation.c
b/source/blender/makesrna/intern/rna_animation.c
index b6ded7a90d8..9f9bc14cd11 100644
--- a/source/blender/makesrna/intern/rna_animation.c
+++ b/source/blender/makesrna/intern/rna_animation.c
@@ -1026,7 +1026,7 @@ void rna_def_animdata_common(StructRNA *srna)
prop = RNA_def_property(srna, "animation_data", PROP_POINTER,
PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "adt");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_override_funcs(prop, NULL, NULL,
"rna_AnimaData_override_apply");
RNA_def_property_ui_text(prop, "Animation Data", "Animation data for
this data-block");
}
@@ -1051,7 +1051,7 @@ static void rna_def_animdata(BlenderRNA *brna)
/* Active Action */
prop = RNA_def_property(srna, "action", PROP_POINTER, PROP_NONE);
/* this flag as well as the dynamic test must be defined for this to be
editable... */
- RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT |
PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_EDITABLE | PROP_ID_REFCOUNT |
PROP_OVERRIDABLE_STATIC);
RNA_def_property_pointer_funcs(prop, NULL, "rna_AnimData_action_set",
NULL, "rna_Action_id_poll");
RNA_def_property_editable_func(prop, "rna_AnimData_action_editable");
RNA_def_property_ui_text(prop, "Action", "Active Action for this
data-block");
diff --git a/source/blender/makesrna/intern/rna_image.c
b/source/blender/makesrna/intern/rna_image.c
index d8116c5c020..212a8bb8e20 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -669,7 +669,7 @@ static void rna_def_image(BlenderRNA *brna)
RNA_def_struct_ui_icon(srna, ICON_IMAGE_DATA);
prop = RNA_def_property(srna, "filepath", PROP_STRING, PROP_FILEPATH);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_string_sdna(prop, NULL, "name");
RNA_def_property_ui_text(prop, "File Name", "Image/Movie file name");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY,
"rna_Image_reload_update");
@@ -709,7 +709,7 @@ static void rna_def_image(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Packed Files", "Collection of packed
images");
prop = RNA_def_property(srna, "field_order", PROP_ENUM, PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
RNA_def_property_enum_items(prop, prop_field_order_items);
RNA_def_property_ui_text(prop, "Field Order", "Order of video fields
(select which lines are displayed first)");
@@ -717,7 +717,7 @@ static void rna_def_image(BlenderRNA *brna)
/* booleans */
prop = RNA_def_property(srna, "use_fields", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_FIELDS);
RNA_def_property_ui_text(prop, "Fields", "Use fields of the image");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY,
"rna_Image_fields_update");
@@ -725,43 +725,43 @@ static void rna_def_image(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_view_as_render", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_VIEW_AS_RENDER);
RNA_def_property_ui_text(prop, "View as Render", "Apply render part of
display transformation when displaying this image on the screen");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, NULL);
prop = RNA_def_property(srna, "use_alpha", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_boolean_negative_sdna(prop, NULL, "flag",
IMA_IGNORE_ALPHA);
RNA_def_property_ui_text(prop, "Use Alpha", "Use the alpha channel
information from the image or make image fully opaque");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY,
"rna_Image_colormanage_update");
prop = RNA_def_property(srna, "use_deinterlace", PROP_BOOLEAN,
PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_DEINTERLACE);
RNA_def_property_ui_text(prop, "Deinterlace", "Deinterlace movie file
on load");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY,
"rna_Image_reload_update");
prop = RNA_def_property(srna, "use_multiview", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_boolean_sdna(prop, NULL, "flag", IMA_USE_VIEWS);
RNA_def_property_ui_text(prop, "Use Multi-View", "Use Multiple Views
(when available)");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY,
"rna_Image_views_format_update");
prop = RNA_def_property(srna, "is_stereo_3d", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_boolean_funcs(prop, "rna_Image_is_stereo_3d_get",
NULL);
RNA_def_property_ui_text(prop, "Stereo 3D", "Image has left and right
views");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "is_multiview", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_boolean_funcs(prop, "rna_Image_is_multiview_get",
NULL);
RNA_def_property_ui_text(prop, "Multiple Views", "Image has more than
one view");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
prop = RNA_def_property(srna, "is_dirty", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_boolean_funcs(prop, "rna_Image_dirty_get", NULL);
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
RNA_def_property_ui_text(prop, "Dirty", "Image has changed and is not
saved");
@@ -805,14 +805,14 @@ static void rna_def_image(BlenderRNA *brna)
/* realtime properties */
prop = RNA_def_property(srna, "mapping", PROP_ENUM, PROP_NONE);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "flag");
RNA_def_property_enum_items(prop, prop_mapping_items);
RNA_def_property_ui_text(prop, "Mapping", "Mapping type to use for this
image in the game engine");
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, NULL);
prop = RNA_def_property(srna, "display_aspect", PROP_FLOAT, PROP_XYZ);
- RNA_def_property_flag(prop, PROP_OVERRIDABLE);
+ RNA_def_property_flag(prop, PROP_OVERRIDABLE_STATIC);
RNA_def_property_float_sdna(prop, NULL, "aspx");
RNA_def_property_array(prop, 2);
RNA_def_property_range(prop, 0.1f, FLT_MAX);
@@ -821,61 +821,61 @@ static void rna_def_image(BlenderRNA *brna)
RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, NULL);
prop = RNA_def_property(srna, "use_animation", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_flag(prop, PR
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
