[Bf-blender-cvs] [7bf2108e4bb] temp-lineart-contained: Merge branch 'master' into temp-lineart-contained

[Antonio Vazquez]

Commit: 7bf2108e4bb360f1ba7f9d50b8726c9b28b93026
Author: Antonio Vazquez
Date:   Sat Feb 20 15:37:07 2021 +0100
Branches: temp-lineart-contained
https://developer.blender.org/rB7bf2108e4bb360f1ba7f9d50b8726c9b28b93026

Merge branch 'master' into temp-lineart-contained

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



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

diff --cc source/blender/editors/object/object_ops.c
index 2fec027fa4b,57676cf5c76..2dc72474d5f
--- a/source/blender/editors/object/object_ops.c
+++ b/source/blender/editors/object/object_ops.c
@@@ -156,9 -153,8 +156,9 @@@ void ED_operatortypes_object(void
    WM_operatortype_append(OBJECT_OT_gpencil_modifier_apply);
    WM_operatortype_append(OBJECT_OT_gpencil_modifier_copy);
    WM_operatortype_append(OBJECT_OT_gpencil_modifier_copy_to_selected);
 +  ED_operatortypes_lineart();
  
-   /* shader fx */
+   /* Shader FX. */
    WM_operatortype_append(OBJECT_OT_shaderfx_add);
    WM_operatortype_append(OBJECT_OT_shaderfx_remove);
    WM_operatortype_append(OBJECT_OT_shaderfx_move_up);