[Bf-blender-cvs] [4dfb31d470f] geometry-nodes-distribute-points: Merge remote-tracking branch 'origin/master' into geometry-nodes-distribute-points

[Dalai Felinto]

Commit: 4dfb31d470fb07a72f4f0ad8cc522ddca77146db
Author: Dalai Felinto
Date:   Thu Dec 10 10:58:41 2020 +0100
Branches: geometry-nodes-distribute-points
https://developer.blender.org/rB4dfb31d470fb07a72f4f0ad8cc522ddca77146db

Merge remote-tracking branch 'origin/master' into geometry-nodes-distribute-points

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



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

diff --cc source/blender/makesdna/DNA_node_types.h
index 825cdc55dbf,13f8b11352a..10631fc11a3
--- a/source/blender/makesdna/DNA_node_types.h
+++ b/source/blender/makesdna/DNA_node_types.h
@@@ -1464,11 -1464,13 +1464,18 @@@ typedef enum GeometryNodeUseAttributeFl
    GEO_NODE_USE_ATTRIBUTE_B = (1 << 1),
  } GeometryNodeUseAttributeFlag;
  
+ typedef enum GeometryNodeAttributeInputMode {
+   GEO_NODE_ATTRIBUTE_INPUT_ATTRIBUTE = 0,
+   GEO_NODE_ATTRIBUTE_INPUT_FLOAT = 1,
+   GEO_NODE_ATTRIBUTE_INPUT_VECTOR = 2,
+   GEO_NODE_ATTRIBUTE_INPUT_COLOR = 3,
+ } GeometryNodeAttributeInputMode;
+ 
 +typedef enum GeometryNodePointDistributeMethod {
 +  GEO_NODE_POINT_DISTRIBUTE_RANDOM = 0,
 +  GEO_NODE_POINT_DISTRIBUTE_POISSON = 1,
 +} GeometryNodePointDistributeMethod;
 +
  #ifdef __cplusplus
  }
  #endif