[Bf-blender-cvs] [d9cb1fa7dcd] geometry-nodes-curve-support: Merge branch 'master' into geometry-nodes-curve-support

[Hans Goudey]

Commit: d9cb1fa7dcd2735d76a0c5b962600d5060481064
Author: Hans Goudey
Date:   Thu Apr 15 07:54:30 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rBd9cb1fa7dcd2735d76a0c5b962600d5060481064

Merge branch 'master' into geometry-nodes-curve-support

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



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

diff --cc source/blender/makesrna/intern/rna_space.c
index f89cbc00adb,2a513691762..aa07ff4006a
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -3053,13 -3046,9 +3046,13 @@@ static void rna_SpaceSpreadsheet_geomet
    if (sspreadsheet->geometry_component_type == GEO_COMPONENT_TYPE_POINT_CLOUD) {
      sspreadsheet->attribute_domain = ATTR_DOMAIN_POINT;
    }
 +  if (sspreadsheet->geometry_component_type == GEO_COMPONENT_TYPE_CURVE &&
 +      !ELEM(sspreadsheet->attribute_domain, ATTR_DOMAIN_POINT, ATTR_DOMAIN_CURVE)) {
 +    sspreadsheet->attribute_domain = ATTR_DOMAIN_POINT;
 +  }
  }
  
- const EnumPropertyItem *rna_SpaceSpreadsheet_attribute_domain_itemf(bContext *C,
+ const EnumPropertyItem *rna_SpaceSpreadsheet_attribute_domain_itemf(bContext *UNUSED(C),
                                                                      PointerRNA *ptr,
                                                                      PropertyRNA *UNUSED(prop),
                                                                      bool *r_free)