[Bf-blender-cvs] [9ae40de20b8] sculpt-dev: sculpt-dev: Fix errors from merge
Joseph Eagar
noreply at git.blender.org
Sat Oct 1 03:45:32 CEST 2022
Commit: 9ae40de20b85b4e00632c0c85aebe5e8f7ebfaa9
Author: Joseph Eagar
Date: Fri Sep 30 18:45:03 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rB9ae40de20b85b4e00632c0c85aebe5e8f7ebfaa9
sculpt-dev: Fix errors from merge
===================================================================
M source/blender/blenkernel/BKE_pbvh.h
M source/blender/blenkernel/intern/customdata.cc
M source/blender/blenkernel/intern/dyntopo.c
M source/blender/blenkernel/intern/pbvh.c
M source/blender/blenkernel/intern/pbvh_bmesh.c
M source/blender/bmesh/intern/bmesh_log.c
M source/blender/draw/intern/draw_pbvh.cc
M source/blender/editors/curves/CMakeLists.txt
M source/blender/editors/gpencil/CMakeLists.txt
M source/blender/editors/interface/CMakeLists.txt
M source/blender/editors/mesh/CMakeLists.txt
M source/blender/editors/render/CMakeLists.txt
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_brush_types.c
M source/blender/editors/sculpt_paint/sculpt_dyntopo.c
M source/blender/editors/sculpt_paint/sculpt_face_set.cc
M source/blender/editors/sculpt_paint/sculpt_smooth.c
M source/blender/editors/sculpt_paint/sculpt_undo.c
M source/blender/nodes/texture/CMakeLists.txt
===================================================================
diff --git a/source/blender/blenkernel/BKE_pbvh.h b/source/blender/blenkernel/BKE_pbvh.h
index d4fcbee2391..ade78185c48 100644
--- a/source/blender/blenkernel/BKE_pbvh.h
+++ b/source/blender/blenkernel/BKE_pbvh.h
@@ -1189,7 +1189,7 @@ ATTR_NO_OPT static void MV_ADD_FLAG(MSculptVert *mv, int flag)
# define MV_ADD_FLAG(mv, flag1) (mv)->flag |= (flag1)
#endif
-#if 0
+#if 1
# include "atomic_ops.h"
# include <float.h>
# include <math.h>
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index 58e0e1ea970..f5d59932c7d 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -2823,7 +2823,7 @@ void CustomData_free_typemask(CustomData *data, const int totelem, eCustomDataMa
CustomData_reset(data);
}
-ATTR_NO_OPT static void customData_update_offsets(CustomData *data)
+static void customData_update_offsets(CustomData *data)
{
const LayerTypeInfo *typeInfo;
int offset = 0;
diff --git a/source/blender/blenkernel/intern/dyntopo.c b/source/blender/blenkernel/intern/dyntopo.c
index 6517d3f6207..6d41cee73ec 100644
--- a/source/blender/blenkernel/intern/dyntopo.c
+++ b/source/blender/blenkernel/intern/dyntopo.c
@@ -1280,7 +1280,7 @@ static void pbvh_bmesh_vert_remove(PBVH *pbvh, BMVert *v)
BM_FACES_OF_VERT_ITER_END;
}
-ATTR_NO_OPT static void pbvh_bmesh_face_remove(
+static void pbvh_bmesh_face_remove(
PBVH *pbvh, BMFace *f, bool log_face, bool check_verts, bool ensure_ownership_transfer)
{
PBVHNode *f_node = pbvh_bmesh_node_from_face(pbvh, f);
@@ -1362,10 +1362,7 @@ void BKE_pbvh_bmesh_remove_vertex(PBVH *pbvh, BMVert *v, bool log_vert)
}
}
-ATTR_NO_OPT void BKE_pbvh_bmesh_add_face(PBVH *pbvh,
- struct BMFace *f,
- bool log_face,
- bool force_tree_walk)
+void BKE_pbvh_bmesh_add_face(PBVH *pbvh, struct BMFace *f, bool log_face, bool force_tree_walk)
{
bm_logstack_push();
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c
index 37c14871ee7..a7ae14a3a9b 100644
--- a/source/blender/blenkernel/intern/pbvh.c
+++ b/source/blender/blenkernel/intern/pbvh.c
@@ -710,21 +710,21 @@ static void pbvh_draw_args_init(PBVH *pbvh, PBVH_GPU_Args *args, PBVHNode *node)
}
}
-ATTR_NO_OPT void BKE_pbvh_build_mesh(PBVH *pbvh,
- Mesh *mesh,
- const MPoly *mpoly,
- const MLoop *mloop,
- MVert *verts,
- MSculptVert *msculptverts,
- int totvert,
- struct CustomData *vdata,
- struct CustomData *ldata,
- struct CustomData *pdata,
- const MLoopTri *looptri,
- int looptri_num,
- bool fast_draw,
- float *face_areas,
- SculptPMap *pmap)
+void BKE_pbvh_build_mesh(PBVH *pbvh,
+ Mesh *mesh,
+ const MPoly *mpoly,
+ const MLoop *mloop,
+ MVert *verts,
+ MSculptVert *msculptverts,
+ int totvert,
+ struct CustomData *vdata,
+ struct CustomData *ldata,
+ struct CustomData *pdata,
+ const MLoopTri *looptri,
+ int looptri_num,
+ bool fast_draw,
+ float *face_areas,
+ SculptPMap *pmap)
{
BBC *prim_bbc = NULL;
BB cb;
diff --git a/source/blender/blenkernel/intern/pbvh_bmesh.c b/source/blender/blenkernel/intern/pbvh_bmesh.c
index cbcb925ba87..a40b6522e76 100644
--- a/source/blender/blenkernel/intern/pbvh_bmesh.c
+++ b/source/blender/blenkernel/intern/pbvh_bmesh.c
@@ -231,11 +231,11 @@ ATTR_NO_OPT void pbvh_bmesh_pbvh_bmesh_check_nodes(PBVH *pbvh)
/****************************** Building ******************************/
/* Update node data after splitting */
-ATTR_NO_OPT static void pbvh_bmesh_node_finalize(PBVH *pbvh,
- const int node_index,
- const int cd_vert_node_offset,
- const int cd_face_node_offset,
- bool add_orco)
+static void pbvh_bmesh_node_finalize(PBVH *pbvh,
+ const int node_index,
+ const int cd_vert_node_offset,
+ const int cd_face_node_offset,
+ bool add_orco)
{
PBVHNode *n = &pbvh->nodes[node_index];
bool has_visible = false;
@@ -3240,8 +3240,7 @@ static void BKE_pbvh_bmesh_correct_tree(PBVH *pbvh, PBVHNode *node, PBVHNode *pa
BMVert *v;
node->children_offset = 0;
-
- pbvh_free_draw_buffers(pbvh, node);
+ node->draw_batches = NULL;
// rebuild bm_other_verts
BMFace *f;
@@ -3693,7 +3692,7 @@ static void pbvh_bmesh_balance_tree(PBVH *pbvh)
MEM_SAFE_FREE(depthmap);
}
-ATTR_NO_OPT static void pbvh_bmesh_join_nodes(PBVH *bvh)
+static void pbvh_bmesh_join_nodes(PBVH *bvh)
{
if (bvh->totnode < 2) {
return;
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index 31b373b76ea..b170137d0ac 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -628,7 +628,7 @@ static BMElem *bm_log_elem_from_id(BMLog *log, uint id)
}
/* Get a vertex from its unique ID */
-ATTR_NO_OPT static BMVert *bm_log_vert_from_id(BMLog *log, uint id)
+static BMVert *bm_log_vert_from_id(BMLog *log, uint id)
{
if (log->bm->idmap.map && id >= ((unsigned int)log->bm->idmap.map_size)) {
return NULL;
@@ -1036,7 +1036,7 @@ static void bm_log_edges_unmake_pre(
}
}
-ATTR_NO_OPT static void bm_log_faces_unmake_pre(
+static void bm_log_faces_unmake_pre(
BMesh *bm, BMLog *log, GHash *faces, BMLogEntry *entry, BMLogCallbacks *callbacks)
{
GHashIterator gh_iter;
@@ -1318,7 +1318,7 @@ static void bm_log_edges_restore(
}
}
-ATTR_NO_OPT static void bm_log_faces_restore(
+static void bm_log_faces_restore(
BMesh *bm, BMLog *log, GHash *faces, BMLogEntry *entry, BMLogCallbacks *callbacks)
{
GHashIterator gh_iter;
@@ -3187,7 +3187,7 @@ void _BM_log_edge_topo_post(BMLog *log, BMEdge *e BMLOG_DEBUG_ARGS)
bm_logstack_pop();
}
-ATTR_NO_OPT void _BM_log_vert_topo_pre(BMLog *log, BMVert *v BMLOG_DEBUG_ARGS)
+void _BM_log_vert_topo_pre(BMLog *log, BMVert *v BMLOG_DEBUG_ARGS)
{
bm_logstack_push();
@@ -3294,9 +3294,7 @@ void _BM_log_vert_topo_post(BMLog *log, BMVert *v BMLOG_DEBUG_ARGS)
* vertices original location, then the move record is deleted.
*/
-ATTR_NO_OPT void _BM_log_vert_removed(BMLog *log,
- BMVert *v,
- int UNUSED(cd_vert_mask_offset) BMLOG_DEBUG_ARGS)
+void _BM_log_vert_removed(BMLog *log, BMVert *v, int UNUSED(cd_vert_mask_offset) BMLOG_DEBUG_ARGS)
{
bm_logstack_push();
diff --git a/source/blender/draw/intern/draw_pbvh.cc b/source/blender/draw/intern/draw_pbvh.cc
index f5fb617f88d..b584f3df256 100644
--- a/source/blender/draw/intern/draw_pbvh.cc
+++ b/source/blender/draw/intern/draw_pbvh.cc
@@ -669,7 +669,7 @@ struct PBVHBatches {
}
}
- ATTR_NO_OPT void fill_vbo_bmesh(PBVHVbo &vbo, PBVH_GPU_Args *args)
+ void fill_vbo_bmesh(PBVHVbo &vbo, PBVH_GPU_Args *args)
{
auto foreach_bmesh_normal = [&](std::function<void(BMLoop * l)> callback) {
for (int i : IndexRange(args->tribuf->tottri)) {
@@ -687,7 +687,7 @@ struct PBVHBatches {
BMVert v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12;
- ATTR_NO_OPT auto foreach_bmesh_flat_vcol = [&](std::function<void(BMLoop * l)> callback) {
+ auto foreach_bmesh_flat_vcol = [&](std::function<void(BMLoop * l)> callback) {
for (int i : IndexRange(args->tribuf->tottri)) {
PBVHTri *tri = args->tribuf->tris + i;
diff --git a/source/blender/editors/curves/CMakeLists.txt b/source/blender/editors/curves/CMakeLists.txt
index 945bba0a77c..9eb090794e9 100644
--- a/source/blender/editors/curves/CMakeLists.txt
+++ b/source/blender/editors/curves/CMakeLists.txt
@@ -13,6 +13,7 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ../../../../intern/atomic
../../bmesh
# RNA_prototypes.h
diff --git a/source/blender/editors/gpencil/CMakeLists.txt b/source/blender/editors/gpencil/CMakeLists.txt
index 866df16f3d6..b7fe20f927c 100644
--- a/source/blender/editors/gpencil/CMakeLists.txt
+++ b/source/blender/editors/gpencil/CMakeLists.txt
@@ -13,6 +13,7 @@ set(INC
../../makesrna
../../windowmanager
../../../../intern/guardedalloc
+ ../../../../intern/atomic
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt
index 6a531c88762..e8e95196d9b 100644
--- a/source/blender/editors/interface/CMakeLists.txt
+++ b/source/blender/editors/interface/CMakeLists.txt
@@ -20,6 +20,7 @@ set(INC
../../render
../../windowmanager
../../../../intern/guardedalloc
+ ../../../../intern/atomic
../../bmesh
# RNA_prototypes.h
${CMAKE_BINARY_DIR}/source/blender/makesrna
diff --git a/source/blender/editors/mesh/CMakeLists.txt b/source/blender/editors/mesh/CMakeLists.txt
index b4e62c8aef7..ddf2fa54a38 100644
--- a/source/blender/editors/mesh/CMakeLists.txt
+++ b/source/blender/editors/mesh/CMakeLists.txt
@@ -18,6 +18,7 @@ set(INC
../../windowmanager
../../../../intern/clog
../../../../intern/guardedalloc
+ ../../.
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list