Commit: ffb328567297ad4b3a1e96c9e85ac547446093b5
Author: Jacques Lucke
Date:   Mon Apr 6 11:55:43 2020 +0200
Branches: temp-test-point-cloud-simulation-depsgraph-integration
https://developer.blender.org/rBffb328567297ad4b3a1e96c9e85ac547446093b5

Merge branch 'simulation-data-block' into simulation-tree-arc

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



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

diff --cc source/blender/makesrna/intern/rna_nodetree.c
index 4fc20a44dbb,31d6ff80f34..eeea12b64bc
--- a/source/blender/makesrna/intern/rna_nodetree.c
+++ b/source/blender/makesrna/intern/rna_nodetree.c
@@@ -1796,31 -1782,9 +1796,31 @@@ static StructRNA *rna_TextureNode_regis
    /* update while blender is running */
    WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
  
-   return nt->ext.srna;
+   return nt->rna_ext.srna;
  }
  
 +static StructRNA *rna_SimulationNode_register(Main *bmain,
 +                                              ReportList *reports,
 +                                              void *data,
 +                                              const char *identifier,
 +                                              StructValidateFunc validate,
 +                                              StructCallbackFunc call,
 +                                              StructFreeFunc free)
 +{
 +  bNodeType *nt = rna_Node_register_base(
 +      bmain, reports, &RNA_SimulationNode, data, identifier, validate, call, 
free);
 +  if (!nt) {
 +    return NULL;
 +  }
 +
 +  nodeRegisterType(nt);
 +
 +  /* update while blender is running */
 +  WM_main_add_notifier(NC_NODE | NA_EDITED, NULL);
 +
 +  return nt->ext.srna;
 +}
 +
  static IDProperty *rna_Node_idprops(PointerRNA *ptr, bool create)
  {
    bNode *node = ptr->data;

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to