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

[Hans Goudey]

Commit: 98c908d6f6f85b4e0dba9aecc34ae3814b8e9e60
Author: Hans Goudey
Date:   Wed Apr 14 14:33:16 2021 -0500
Branches: geometry-nodes-curve-support
https://developer.blender.org/rB98c908d6f6f85b4e0dba9aecc34ae3814b8e9e60

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

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



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

diff --cc source/blender/makesrna/intern/rna_space.c
index d2e952156df,2af8a58c137..f89cbc00adb
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@@ -3099,12 -3098,12 +3102,17 @@@ const EnumPropertyItem *rna_SpaceSpread
          continue;
        }
      }
 +    if (component_type == GEO_COMPONENT_TYPE_CURVE) {
 +      if (!ELEM(item->value, ATTR_DOMAIN_POINT, ATTR_DOMAIN_CURVE)) {
 +        continue;
 +      }
 +    }
-     RNA_enum_item_add(&item_array, &items_len, item);
+     if (item->value == ATTR_DOMAIN_POINT && component_type == GEO_COMPONENT_TYPE_MESH) {
+       RNA_enum_item_add(&item_array, &items_len, &mesh_vertex_domain_item);
+     }
+     else {
+       RNA_enum_item_add(&item_array, &items_len, item);
+     }
    }
    RNA_enum_item_end(&item_array, &items_len);