[Bf-blender-cvs] [82d3b0f9278] master: Fix UI (and code!) typos.

[Bastien Montagne]

Commit: 82d3b0f9278619000f96fa3a20c068a26c82d5ba
Author: Bastien Montagne
Date:   Mon Mar 22 10:56:25 2021 +0100
Branches: master
https://developer.blender.org/rB82d3b0f9278619000f96fa3a20c068a26c82d5ba

Fix UI (and code!) typos.

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

M	source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M	source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
M	source/blender/makesdna/DNA_object_types.h
M	source/blender/makesrna/intern/rna_object.c

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

diff --git a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
index 4597e82b2dc..587b53fd730 100644
--- a/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
+++ b/source/blender/gpencil_modifiers/intern/MOD_gpencillineart.c
@@ -428,7 +428,7 @@ static void baking_panel_draw(const bContext *UNUSED(C), Panel *panel)
   if (is_baked) {
     uiLayout *col = uiLayoutColumn(layout, false);
     uiLayoutSetPropSep(col, false);
-    uiItemL(col, IFACE_("Modifier has baked data."), ICON_NONE);
+    uiItemL(col, IFACE_("Modifier has baked data"), ICON_NONE);
     uiItemR(
         col, ptr, "is_baked", UI_ITEM_R_TOGGLE, IFACE_("Continue Without Clearing"), ICON_NONE);
   }
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 552e474846c..7fb3981d9dc 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -1711,7 +1711,7 @@ static void lineart_geometry_object_load(Depsgraph *dg,
       LineartLineSegment *rls = lineart_mem_aquire(&rb->render_data_pool,
                                                    sizeof(LineartLineSegment));
       BLI_addtail(&la_e->segments, rls);
-      if (usage == OBJECT_LRT_INHERENT || usage == OBJECT_LRT_INCLUDE ||
+      if (usage == OBJECT_LRT_INHERIT || usage == OBJECT_LRT_INCLUDE ||
           usage == OBJECT_LRT_NO_INTERSECTION) {
         lineart_add_edge_to_list(rb, la_e);
       }
@@ -1750,10 +1750,10 @@ static int lineart_usage_check(Collection *c, Object *ob, LineartRenderBuffer *_
 {
 
   if (!c) {
-    return OBJECT_LRT_INHERENT;
+    return OBJECT_LRT_INHERIT;
   }
 
-  int object_has_special_usage = (ob->lineart.usage != OBJECT_LRT_INHERENT);
+  int object_has_special_usage = (ob->lineart.usage != OBJECT_LRT_INHERIT);
 
   if (object_has_special_usage) {
     return ob->lineart.usage;
@@ -1761,7 +1761,7 @@ static int lineart_usage_check(Collection *c, Object *ob, LineartRenderBuffer *_
 
   if (c->children.first == NULL) {
     if (BKE_collection_has_object(c, (Object *)(ob->id.orig_id))) {
-      if (ob->lineart.usage == OBJECT_LRT_INHERENT) {
+      if (ob->lineart.usage == OBJECT_LRT_INHERIT) {
         switch (c->lineart_usage) {
           case COLLECTION_LRT_OCCLUSION_ONLY:
             return OBJECT_LRT_OCCLUSION_ONLY;
@@ -1772,16 +1772,16 @@ static int lineart_usage_check(Collection *c, Object *ob, LineartRenderBuffer *_
           case COLLECTION_LRT_NO_INTERSECTION:
             return OBJECT_LRT_NO_INTERSECTION;
         }
-        return OBJECT_LRT_INHERENT;
+        return OBJECT_LRT_INHERIT;
       }
       return ob->lineart.usage;
     }
-    return OBJECT_LRT_INHERENT;
+    return OBJECT_LRT_INHERIT;
   }
 
   LISTBASE_FOREACH (CollectionChild *, cc, &c->children) {
     int result = lineart_usage_check(cc->collection, ob, _rb);
-    if (result > OBJECT_LRT_INHERENT) {
+    if (result > OBJECT_LRT_INHERIT) {
       return result;
     }
   }
@@ -1799,7 +1799,7 @@ static int lineart_usage_check(Collection *c, Object *ob, LineartRenderBuffer *_
     }
   }
 
-  return OBJECT_LRT_INHERENT;
+  return OBJECT_LRT_INHERIT;
 }
 
 static void lineart_main_load_geometries(
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
index 8c16dbdb25a..3ec32ad501e 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_ops.c
@@ -407,7 +407,7 @@ static int lineart_gpencil_clear_strokes_all_exec(bContext *C, wmOperator *op)
   }
   CTX_DATA_END;
 
-  BKE_report(op->reports, RPT_INFO, "All line art objects are now cleared.");
+  BKE_report(op->reports, RPT_INFO, "All line art objects are now cleared");
 
   return OPERATOR_FINISHED;
 }
@@ -440,7 +440,7 @@ void OBJECT_OT_lineart_bake_strokes_all(wmOperatorType *ot)
 void OBJECT_OT_lineart_clear(wmOperatorType *ot)
 {
   ot->name = "Clear Baked Line Art";
-  ot->description = "Clear all strokes in current GPencil obejct";
+  ot->description = "Clear all strokes in current GPencil object";
   ot->idname = "OBJECT_OT_lineart_clear";
 
   ot->exec = lineart_gpencil_clear_strokes_exec;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index fa4e3953f5b..aa0768d1eed 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -214,7 +214,7 @@ typedef struct ObjectLineArt {
 } ObjectLineArt;
 
 enum ObjectFeatureLine_Usage {
-  OBJECT_LRT_INHERENT = 0,
+  OBJECT_LRT_INHERIT = 0,
   OBJECT_LRT_INCLUDE = (1 << 0),
   OBJECT_LRT_OCCLUSION_ONLY = (1 << 1),
   OBJECT_LRT_EXCLUDE = (1 << 2),
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index 77a4d636adc..b04fea11a4d 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2673,7 +2673,7 @@ static void rna_def_object_lineart(BlenderRNA *brna)
   PropertyRNA *prop;
 
   static EnumPropertyItem prop_feature_line_usage_items[] = {
-      {OBJECT_LRT_INHERENT, "INHEREIT", 0, "Inhereit", "Use settings from the parent collection"},
+      {OBJECT_LRT_INHERIT, "INHERIT", 0, "Inherit", "Use settings from the parent collection"},
       {OBJECT_LRT_INCLUDE,
        "INCLUDE",
        0,