[Bf-blender-cvs] [fff4676feb3] greasepencil-object: Replace "Notes" by "Annotations" to keep UI consistency

[Antonio Vazquez]

Commit: fff4676feb38dd7832158745724b9a7f33da3644
Author: Antonio Vazquez
Date:   Fri Jul 13 10:14:56 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBfff4676feb38dd7832158745724b9a7f33da3644

Replace "Notes" by "Annotations" to keep UI consistency

We can not use the word "Notes" in the UI for annotations because it creates confusion for the user.

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

M	release/scripts/startup/bl_ui/properties_grease_pencil_common.py
M	source/blender/editors/gpencil/annotate_paint.c
M	source/blender/editors/gpencil/gpencil_data.c
M	source/blender/editors/space_view3d/view3d_manipulator_ruler.c
M	source/blender/editors/space_view3d/view3d_ruler.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 c076b7f3480..6f72661ebf9 100644
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@ -728,7 +728,7 @@ class GPENCIL_UL_annotation_layer(UIList):
 
 
 class GreasePencilDataPanel:
-    bl_label = "Notes"
+    bl_label = "Annotations"
     bl_region_type = 'UI'
 
     @classmethod
diff --git a/source/blender/editors/gpencil/annotate_paint.c b/source/blender/editors/gpencil/annotate_paint.c
index bac62995140..e09a8b98673 100644
--- a/source/blender/editors/gpencil/annotate_paint.c
+++ b/source/blender/editors/gpencil/annotate_paint.c
@@ -1169,7 +1169,7 @@ static bool gp_session_initdata(bContext *C, tGPsdata *p)
 	else {
 		/* if no existing GPencil block exists, add one */
 		if (*gpd_ptr == NULL) {
-			bGPdata *gpd = BKE_gpencil_data_addnew(bmain, "Notes");
+			bGPdata *gpd = BKE_gpencil_data_addnew(bmain, "Annotations");
 			*gpd_ptr = gpd;
 
 			/* mark datablock as being used for annotations */
diff --git a/source/blender/editors/gpencil/gpencil_data.c b/source/blender/editors/gpencil/gpencil_data.c
index 60b950cd6a3..dd1852ca8ce 100644
--- a/source/blender/editors/gpencil/gpencil_data.c
+++ b/source/blender/editors/gpencil/gpencil_data.c
@@ -124,7 +124,7 @@ static int gp_data_add_exec(bContext *C, wmOperator *op)
 
 		/* add new datablock, with a single layer ready to use (so users don't have to perform an extra step) */
 		if (is_annotation) {
-			bGPdata *gpd = BKE_gpencil_data_addnew(bmain, DATA_("Notes"));
+			bGPdata *gpd = BKE_gpencil_data_addnew(bmain, DATA_("Annotations"));
 			*gpd_ptr = gpd;
 
 			/* tag for annotations */
@@ -235,7 +235,7 @@ static int gp_layer_add_exec(bContext *C, wmOperator *op)
 		Main *bmain = CTX_data_main(C);
 		if (is_annotation) {
 			/* Annotations */
-			*gpd_ptr = BKE_gpencil_data_addnew(bmain, DATA_("Notes"));
+			*gpd_ptr = BKE_gpencil_data_addnew(bmain, DATA_("Annotations"));
 
 			/* mark as annotation */
 			(*gpd_ptr)->flag |= GP_DATA_ANNOTATIONS;
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c b/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
index 9f10afd4149..eb681b2ba8e 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_manipulator_ruler.c
@@ -399,7 +399,7 @@ static bool view3d_ruler_to_gpencil(bContext *C, wmManipulatorGroup *mgroup)
 	bool changed = false;
 
 	if (scene->gpd == NULL) {
-		scene->gpd = BKE_gpencil_data_addnew(bmain, "Notes");
+		scene->gpd = BKE_gpencil_data_addnew(bmain, "Annotations");
 	}
 	gpd = scene->gpd;
 
diff --git a/source/blender/editors/space_view3d/view3d_ruler.c b/source/blender/editors/space_view3d/view3d_ruler.c
index c5790b36efb..b790e008147 100644
--- a/source/blender/editors/space_view3d/view3d_ruler.c
+++ b/source/blender/editors/space_view3d/view3d_ruler.c
@@ -314,7 +314,7 @@ static bool view3d_ruler_to_gpencil(bContext *C, RulerInfo *ruler_info)
 
 	/* FIXME: This needs to be reviewed. Should it keep being done like this? */
 	if (scene->gpd == NULL) {
-		scene->gpd = BKE_gpencil_data_addnew(bmain, "Notes");
+		scene->gpd = BKE_gpencil_data_addnew(bmain, "Annotations");
 	}
 	bGPdata *gpd = scene->gpd;