[Bf-blender-cvs] [ae4afcfbee2] geometry-nodes-point-separate-node: Merge branch 'master' into geometry-nodes-point-separate-node

[Hans Goudey]

Commit: ae4afcfbee2c55f82ceda1461a264d1f7af31fc1
Author: Hans Goudey
Date:   Tue Dec 8 11:27:16 2020 -0600
Branches: geometry-nodes-point-separate-node
https://developer.blender.org/rBae4afcfbee2c55f82ceda1461a264d1f7af31fc1

Merge branch 'master' into geometry-nodes-point-separate-node

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



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

diff --cc source/blender/makesrna/intern/rna_attribute.c
index c8be4344be0,95f6340174a..f98ca47d767
--- a/source/blender/makesrna/intern/rna_attribute.c
+++ b/source/blender/makesrna/intern/rna_attribute.c
@@@ -38,13 -38,12 +38,13 @@@
  #include "WM_types.h"
  
  const EnumPropertyItem rna_enum_attribute_type_items[] = {
-     {CD_PROP_FLOAT, "FLOAT", 0, "Float", "Floating point value"},
-     {CD_PROP_INT32, "INT", 0, "Integer", "32 bit integer"},
-     {CD_PROP_FLOAT3, "FLOAT_VECTOR", 0, "Vector", "3D vector with floating point values"},
-     {CD_PROP_COLOR, "FLOAT_COLOR", 0, "Float Color", "RGBA color with floating point precisions"},
+     {CD_PROP_FLOAT, "FLOAT", 0, "Float", "Floating-point value"},
+     {CD_PROP_INT32, "INT", 0, "Integer", "32-bit integer"},
+     {CD_PROP_FLOAT3, "FLOAT_VECTOR", 0, "Vector", "3D vector with floating-point values"},
+     {CD_PROP_COLOR, "FLOAT_COLOR", 0, "Float Color", "RGBA color with floating-point precisions"},
      {CD_MLOOPCOL, "BYTE_COLOR", 0, "Byte Color", "RGBA color with 8-bit precision"},
      {CD_PROP_STRING, "STRING", 0, "String", "Text string"},
 +    {CD_PROP_BOOL, "BOOLEAN", 0, "Boolean", "True or false"},
      {0, NULL, 0, NULL, NULL},
  };