[Bf-blender-cvs] [aa1f2f243dd] temp-pbvh-split: Merge branch 'master' into temp-pbvh-split

[Joseph Eagar]

Commit: aa1f2f243ddb7ed340856ddf97ec650407ad386b
Author: Joseph Eagar
Date:   Fri Oct 14 23:22:01 2022 -0700
Branches: temp-pbvh-split
https://developer.blender.org/rBaa1f2f243ddb7ed340856ddf97ec650407ad386b

Merge branch 'master' into temp-pbvh-split

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



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

diff --cc source/blender/blenkernel/BKE_pbvh.h
index 6d103eab8a7,42cd1536dcf..c3100dd2345
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@@ -125,7 -125,8 +125,9 @@@ typedef enum 
    PBVH_UpdateTopology = 1 << 13,
    PBVH_UpdateColor = 1 << 14,
    PBVH_RebuildPixels = 1 << 15,
 -  PBVH_TopologyUpdated = 1 << 16, /* Used internally by pbvh_bmesh.c */
 +  PBVH_TexLeaf = 1 << 16,
++  PBVH_TopologyUpdated = 1 << 17, /* Used internally by pbvh_bmesh.c */
+ 
  } PBVHNodeFlags;
  
  typedef struct PBVHFrustumPlanes {