[Bf-blender-cvs] [84e81b8cc39] geometry-nodes: Merge branch 'master' into geometry-nodes

[Hans Goudey]

Commit: 84e81b8cc39310a98fb6329614e1beb574eb3dd3
Author: Hans Goudey
Date:   Tue Oct 27 14:01:48 2020 -0500
Branches: geometry-nodes
https://developer.blender.org/rB84e81b8cc39310a98fb6329614e1beb574eb3dd3

Merge branch 'master' into geometry-nodes

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



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

diff --cc source/blender/makesrna/intern/rna_modifier.c
index 4c511cd44ac,8a66c95beef..5e82ebce528
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@@ -1600,47 -1593,10 +1591,40 @@@ static int rna_MeshSequenceCacheModifie
  #  endif
  }
  
 +static bool rna_NodesModifier_node_group_poll(PointerRNA *ptr, PointerRNA value)
 +{
 +  NodesModifierData *nmd = ptr->data;
 +  bNodeTree *ntree = value.data;
 +  UNUSED_VARS(nmd, ntree);
 +  return true;
 +}
 +
 +static void rna_NodesModifier_node_group_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 +{
 +  NodesModifierData *nmd = ptr->data;
 +  rna_Modifier_dependency_update(bmain, scene, ptr);
 +  MOD_nodes_update_interface(nmd);
 +}
 +
 +static IDProperty *rna_NodesModifierSettings_properties(PointerRNA *ptr, bool create)
 +{
 +  NodesModifierSettings *settings = ptr->data;
 +  if (create && settings->properties == NULL) {
 +    IDPropertyTemplate val = {0};
 +    settings->properties = IDP_New(IDP_GROUP, &val, "Nodes Modifier Settings");
 +  }
 +  return settings->properties;
 +}
 +
 +static char *rna_NodesModifierSettings_path(PointerRNA *UNUSED(ptr))
 +{
 +  return BLI_strdup("settings");
 +}
 +
  #else
  
- /* NOTE: *MUST* return subdivision_type property. */
- static PropertyRNA *rna_def_property_subdivision_common(StructRNA *srna, const char type[])
+ static void rna_def_property_subdivision_common(StructRNA *srna)
  {
-   static const EnumPropertyItem prop_subdivision_type_items[] = {
-       {SUBSURF_TYPE_CATMULL_CLARK, "CATMULL_CLARK", 0, "Catmull-Clark", ""},
-       {SUBSURF_TYPE_SIMPLE, "SIMPLE", 0, "Simple", ""},
-       {0, NULL, 0, NULL, NULL},
-   };
- 
    static const EnumPropertyItem prop_uv_smooth_items[] = {
      {SUBSURF_UV_SMOOTH_NONE, "NONE", 0, "None", "UVs are not smoothed, boundaries are kept sharp"},
      {SUBSURF_UV_SMOOTH_PRESERVE_CORNERS,