[Bf-blender-cvs] [b2d2a5eee43] temp-sculpt-cavity-mask: temp-sculpt-cavity-mask: Another attempt at fixing osx compile error
Joseph Eagar
noreply at git.blender.org
Tue Aug 9 07:36:20 CEST 2022
Commit: b2d2a5eee4349bddbff8340e5fc398336e4ee938
Author: Joseph Eagar
Date: Mon Aug 8 22:35:51 2022 -0700
Branches: temp-sculpt-cavity-mask
https://developer.blender.org/rBb2d2a5eee4349bddbff8340e5fc398336e4ee938
temp-sculpt-cavity-mask: Another attempt at fixing osx compile error
===================================================================
M source/blender/blenlib/BLI_hash.hh
M source/blender/editors/sculpt_paint/sculpt_automasking.cc
===================================================================
diff --git a/source/blender/blenlib/BLI_hash.hh b/source/blender/blenlib/BLI_hash.hh
index 925cfd91704..25d7cd6aaf8 100644
--- a/source/blender/blenlib/BLI_hash.hh
+++ b/source/blender/blenlib/BLI_hash.hh
@@ -137,7 +137,6 @@ TRIVIAL_DEFAULT_INT_HASH(int32_t);
TRIVIAL_DEFAULT_INT_HASH(uint32_t);
TRIVIAL_DEFAULT_INT_HASH(int64_t);
TRIVIAL_DEFAULT_INT_HASH(uint64_t);
-TRIVIAL_DEFAULT_INT_HASH(intptr_t);
/**
* One should try to avoid using floats as keys in hash tables, but sometimes it is convenient.
diff --git a/source/blender/editors/sculpt_paint/sculpt_automasking.cc b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
index e9adb47190b..1d788aea846 100644
--- a/source/blender/editors/sculpt_paint/sculpt_automasking.cc
+++ b/source/blender/editors/sculpt_paint/sculpt_automasking.cc
@@ -234,7 +234,7 @@ static void sculpt_calc_blurred_cavity(SculptSession *ss,
zero_v3(sco2);
Vector<CavityBlurVert, 64> queue;
- Set<intptr_t, 64> visit;
+ Set<int64_t, 64> visit;
int start = 0, end = 0;
More information about the Bf-blender-cvs
mailing list