Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Vazquez <blendergit@gmail.com>2020-05-07 13:17:00 +0300
committerAntonio Vazquez <blendergit@gmail.com>2020-05-07 13:17:00 +0300
commit45a77ba09dbe8c51084c0aaa80f884a9954459cf (patch)
tree8c7746e16db023c4654ea0e0b5bd989d9f4e61b9 /source/blender/makesrna
parentebd7e87f33ffad86cad81dbe764fa7e424e42ce0 (diff)
parent3fed85f9d2cfcd120c58599e55b4518e62281ee1 (diff)
Merge branch 'blender-v2.83-release'
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_space.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 37a9c210832..181d4529ef1 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -6382,7 +6382,7 @@ static void rna_def_space_clip(BlenderRNA *brna)
{0, NULL, 0, NULL, NULL},
};
- static const EnumPropertyItem gpencil_source_items[] = {
+ static const EnumPropertyItem annotation_source_items[] = {
{SC_GPENCIL_SRC_CLIP,
"CLIP",
0,
@@ -6644,10 +6644,10 @@ static void rna_def_space_clip(BlenderRNA *brna)
RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);
/* grease pencil source */
- prop = RNA_def_property(srna, "grease_pencil_source", PROP_ENUM, PROP_NONE);
+ prop = RNA_def_property(srna, "annotation_source", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "gpencil_src");
- RNA_def_property_enum_items(prop, gpencil_source_items);
- RNA_def_property_ui_text(prop, "Grease Pencil Source", "Where the grease pencil comes from");
+ RNA_def_property_enum_items(prop, annotation_source_items);
+ RNA_def_property_ui_text(prop, "Annotation Source", "Where the annotation comes from");
RNA_def_property_translation_context(prop, BLT_I18NCONTEXT_ID_MOVIECLIP);
RNA_def_property_update(prop, NC_MOVIECLIP | ND_DISPLAY, NULL);