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

[Sebastian Parborg]

Commit: be65d127074d75da8695879a7ffeaeb96f5306aa
Author: Sebastian Parborg
Date:   Mon Jan 25 10:46:26 2021 +0100
Branches: temp-lineart-contained
https://developer.blender.org/rBbe65d127074d75da8695879a7ffeaeb96f5306aa

Merge branch 'master' into temp-lineart-contained

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



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

diff --cc source/blender/editors/object/object_add.c
index 8513f60604a,9ab5eafa84d..7361e17be50
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@@ -66,9 -65,9 +66,10 @@@
  #include "BKE_duplilist.h"
  #include "BKE_effect.h"
  #include "BKE_font.h"
+ #include "BKE_geometry_set.h"
  #include "BKE_gpencil_curve.h"
  #include "BKE_gpencil_geom.h"
 +#include "BKE_gpencil_modifier.h"
  #include "BKE_hair.h"
  #include "BKE_key.h"
  #include "BKE_lattice.h"
diff --cc source/blender/makesrna/intern/rna_object.c
index 342243f3504,faa20e642cf..f0c1a3384bd
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@@ -3467,13 -3404,8 +3478,13 @@@ static void rna_def_object(BlenderRNA *
    RNA_def_property_flag(prop, PROP_NEVER_NULL);
    RNA_def_property_struct_type(prop, "ObjectDisplay");
    RNA_def_property_pointer_funcs(prop, "rna_Object_display_get", NULL, NULL, NULL);
-   RNA_def_property_ui_text(prop, "Object Display", "Object display settings for 3d viewport");
+   RNA_def_property_ui_text(prop, "Object Display", "Object display settings for 3D viewport");
  
 +  /* Line Art */
 +  prop = RNA_def_property(srna, "lineart", PROP_POINTER, PROP_NONE);
 +  RNA_def_property_struct_type(prop, "ObjectLineArt");
 +  RNA_def_property_ui_text(prop, "Line Art", "Line Art settings for the object");
 +
    RNA_define_lib_overridable(false);
  
    /* anim */