[Bf-blender-cvs] [151df9b3fc8] sculpt-dev: Sculpt: get rid of debug ATTR_NO_OPT's
Joseph Eagar
noreply at git.blender.org
Fri Oct 15 05:06:10 CEST 2021
Commit: 151df9b3fc8157c8569308235abb6027284a49f7
Author: Joseph Eagar
Date: Thu Oct 14 20:05:57 2021 -0700
Branches: sculpt-dev
https://developer.blender.org/rB151df9b3fc8157c8569308235abb6027284a49f7
Sculpt: get rid of debug ATTR_NO_OPT's
===================================================================
M source/blender/bmesh/intern/bmesh_log.c
M source/blender/editors/sculpt_paint/sculpt.c
M source/blender/editors/sculpt_paint/sculpt_undo.c
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_log.c b/source/blender/bmesh/intern/bmesh_log.c
index b93964059a9..215392318d7 100644
--- a/source/blender/bmesh/intern/bmesh_log.c
+++ b/source/blender/bmesh/intern/bmesh_log.c
@@ -941,7 +941,7 @@ static void bm_log_face_bmface_copy(
/************************ Helpers for undo/redo ***********************/
// exec vert kill callbacks before killing faces
-ATTR_NO_OPT static void bm_log_verts_unmake_pre(
+static void bm_log_verts_unmake_pre(
BMesh *bm, BMLog *log, GHash *verts, BMLogEntry *entry, BMLogCallbacks *callbacks)
{
BMLogVert *lv;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index 2fc977ffd39..fa8344f953f 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3165,8 +3165,9 @@ bool SCULPT_stroke_is_dynamic_topology(const SculptSession *ss, const Brush *bru
/*** paint mesh ***/
-ATTR_NO_OPT static void paint_mesh_restore_co_task_cb(
- void *__restrict userdata, const int n, const TaskParallelTLS *__restrict UNUSED(tls))
+static void paint_mesh_restore_co_task_cb(void *__restrict userdata,
+ const int n,
+ const TaskParallelTLS *__restrict UNUSED(tls))
{
SculptThreadedTaskData *data = userdata;
SculptSession *ss = data->ob->sculpt;
diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c
index 3c826b6f9ae..3cfba8acc1e 100644
--- a/source/blender/editors/sculpt_paint/sculpt_undo.c
+++ b/source/blender/editors/sculpt_paint/sculpt_undo.c
@@ -433,7 +433,7 @@ typedef struct BmeshUndoData {
bool is_redo;
} BmeshUndoData;
-ATTR_NO_OPT static void bmesh_undo_on_vert_kill(BMVert *v, void *userdata)
+static void bmesh_undo_on_vert_kill(BMVert *v, void *userdata)
{
BmeshUndoData *data = (BmeshUndoData *)userdata;
int ni = BM_ELEM_CD_GET_INT(v, data->cd_vert_node_offset);
More information about the Bf-blender-cvs
mailing list