[Bf-blender-cvs] [b386f960f6a] master: Fix error in Cycles geometry update tagging after pointcloud addition

Brecht Van Lommel noreply at git.blender.org
Fri Dec 17 15:03:44 CET 2021


Commit: b386f960f6ab37a65075bf48b09815c2a28c5ad5
Author: Brecht Van Lommel
Date:   Fri Dec 17 14:59:24 2021 +0100
Branches: master
https://developer.blender.org/rBb386f960f6ab37a65075bf48b09815c2a28c5ad5

Fix error in Cycles geometry update tagging after pointcloud addition

Thanks to Christophe Hery for spotting this.

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

M	intern/cycles/scene/geometry.cpp

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

diff --git a/intern/cycles/scene/geometry.cpp b/intern/cycles/scene/geometry.cpp
index 558b0e13b0f..dfd10cb12b5 100644
--- a/intern/cycles/scene/geometry.cpp
+++ b/intern/cycles/scene/geometry.cpp
@@ -1370,22 +1370,22 @@ enum {
   DEVICE_MESH_DATA_MODIFIED = (1 << 1),
   DEVICE_POINT_DATA_MODIFIED = (1 << 2),
 
-  ATTR_FLOAT_MODIFIED = (1 << 2),
-  ATTR_FLOAT2_MODIFIED = (1 << 3),
-  ATTR_FLOAT3_MODIFIED = (1 << 4),
-  ATTR_FLOAT4_MODIFIED = (1 << 5),
-  ATTR_UCHAR4_MODIFIED = (1 << 6),
-
-  CURVE_DATA_NEED_REALLOC = (1 << 7),
-  MESH_DATA_NEED_REALLOC = (1 << 8),
-  POINT_DATA_NEED_REALLOC = (1 << 9),
-
-  ATTR_FLOAT_NEEDS_REALLOC = (1 << 10),
-  ATTR_FLOAT2_NEEDS_REALLOC = (1 << 11),
-  ATTR_FLOAT3_NEEDS_REALLOC = (1 << 12),
-  ATTR_FLOAT4_NEEDS_REALLOC = (1 << 13),
-
-  ATTR_UCHAR4_NEEDS_REALLOC = (1 << 14),
+  ATTR_FLOAT_MODIFIED = (1 << 3),
+  ATTR_FLOAT2_MODIFIED = (1 << 4),
+  ATTR_FLOAT3_MODIFIED = (1 << 5),
+  ATTR_FLOAT4_MODIFIED = (1 << 6),
+  ATTR_UCHAR4_MODIFIED = (1 << 7),
+
+  CURVE_DATA_NEED_REALLOC = (1 << 8),
+  MESH_DATA_NEED_REALLOC = (1 << 9),
+  POINT_DATA_NEED_REALLOC = (1 << 10),
+
+  ATTR_FLOAT_NEEDS_REALLOC = (1 << 11),
+  ATTR_FLOAT2_NEEDS_REALLOC = (1 << 12),
+  ATTR_FLOAT3_NEEDS_REALLOC = (1 << 13),
+  ATTR_FLOAT4_NEEDS_REALLOC = (1 << 14),
+
+  ATTR_UCHAR4_NEEDS_REALLOC = (1 << 15),
 
   ATTRS_NEED_REALLOC = (ATTR_FLOAT_NEEDS_REALLOC | ATTR_FLOAT2_NEEDS_REALLOC |
                         ATTR_FLOAT3_NEEDS_REALLOC | ATTR_FLOAT4_NEEDS_REALLOC |



More information about the Bf-blender-cvs mailing list