[Bf-blender-cvs] [3fed85f9d2c] blender-v2.83-release: Fix T76500: Annotation Tooltip in Movie Clip Editor is using old grease pencil text

[Antonio Vazquez]

Commit: 3fed85f9d2cfcd120c58599e55b4518e62281ee1
Author: Antonio Vazquez
Date:   Thu May 7 12:16:33 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB3fed85f9d2cfcd120c58599e55b4518e62281ee1

Fix T76500: Annotation Tooltip in Movie Clip Editor is using old grease pencil text

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	source/blender/makesrna/intern/rna_space.c

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

diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 5647f35383a..8b02f858b65 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -116,9 +116,9 @@ class AnnotationDrawingToolsPanel:
             col.label(text="Data Source:")
             row = col.row(align=True)
             if is_3d_view:
-                row.prop(context.tool_settings, "grease_pencil_source", expand=True)
+                row.prop(context.tool_settings, "annotation_source", expand=True)
             elif is_clip_editor:
-                row.prop(context.space_data, "grease_pencil_source", expand=True)
+                row.prop(context.space_data, "annotation_source", expand=True)
 
         gpencil_stroke_placement_settings(context, col)
 
@@ -448,7 +448,7 @@ class AnnotationDataPanel:
 
         # Owner selector.
         if context.space_data.type == 'CLIP_EDITOR':
-            layout.row().prop(context.space_data, "grease_pencil_source", expand=True)
+            layout.row().prop(context.space_data, "annotation_source", expand=True)
 
         layout.template_ID(gpd_owner, "grease_pencil", new="gpencil.annotation_add", unlink="gpencil.data_unlink")
 
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 1f072d2eb26..d4d35e07c2a 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -6309,7 +6309,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,
@@ -6571,10 +6571,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);