Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: replace commented code with define check

Browse Source 
Avoids duplicated comments,
also quiet warning accessing non-existing variable.
This commit is contained in:
Campbell Barton
2020-03-04 10:56:56 +11:00
parent a5c984a57d
commit a37dceb139
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/object/object_remesh.c
View File

@@ -74,6 +74,9 @@
#include "object_intern.h" // own include #include "object_intern.h" // own include
/* TODO(sebpa): unstable, can lead to unrecoverable errors. */
// #define USE_MESH_CURVATURE
static bool object_remesh_poll(bContext *C) static bool object_remesh_poll(bContext *C)
{ {
Object *ob = CTX_data_active_object(C); Object *ob = CTX_data_active_object(C);
@@ -405,8 +408,12 @@ static void quadriflow_start_job(void *customdata, short *stop, short *do_update
qj->target_faces, qj->target_faces,
qj->seed, qj->seed,
qj->use_preserve_sharp, qj->use_preserve_sharp,
qj->use_preserve_boundary || qj->use_paint_symmetry, (qj->use_preserve_boundary || qj->use_paint_symmetry),
false, // TODO unstable, can lead to uncoverable errors (sebpa) qj->use_mesh_curvature, #ifdef USE_MESH_CURVATURE
qj->use_mesh_curvature,
#else
false,
#endif
quadriflow_update_job, quadriflow_update_job,
(void *)qj); (void *)qj);
@@ -416,7 +423,7 @@ static void quadriflow_start_job(void *customdata, short *stop, short *do_update
*do_update = true; *do_update = true;
*stop = 0; *stop = 0;
if (qj->success == 1) { if (qj->success == 1) {
/* This is not a user cancelation event */ /* This is not a user cancellation event. */
qj->success = 0; qj->success = 0;
} }
return; return;
@@ -497,7 +504,9 @@ static int quadriflow_remesh_exec(bContext *C, wmOperator *op)
job->use_preserve_sharp = RNA_boolean_get(op->ptr, "use_preserve_sharp"); job->use_preserve_sharp = RNA_boolean_get(op->ptr, "use_preserve_sharp");
job->use_preserve_boundary = RNA_boolean_get(op->ptr, "use_preserve_boundary"); job->use_preserve_boundary = RNA_boolean_get(op->ptr, "use_preserve_boundary");
#ifdef USE_MESH_CURVATURE
job->use_mesh_curvature = RNA_boolean_get(op->ptr, "use_mesh_curvature"); job->use_mesh_curvature = RNA_boolean_get(op->ptr, "use_mesh_curvature");
#endif
job->preserve_paint_mask = RNA_boolean_get(op->ptr, "preserve_paint_mask"); job->preserve_paint_mask = RNA_boolean_get(op->ptr, "preserve_paint_mask");
job->smooth_normals = RNA_boolean_get(op->ptr, "smooth_normals"); job->smooth_normals = RNA_boolean_get(op->ptr, "smooth_normals");
@@ -671,13 +680,13 @@ void OBJECT_OT_quadriflow_remesh(wmOperatorType *ot)
false, false,
"Preserve Mesh Boundary", "Preserve Mesh Boundary",
"Try to preserve mesh boundary on the mesh"); "Try to preserve mesh boundary on the mesh");
/* TODO unstable, can lead to uncoverable errors (sebpa) #ifdef USE_MESH_CURVATURE
RNA_def_boolean(ot->srna, RNA_def_boolean(ot->srna,
"use_mesh_curvature", "use_mesh_curvature",
false, false,
"Use Mesh Curvature", "Use Mesh Curvature",
"Take the mesh curvature into account when remeshing"); "Take the mesh curvature into account when remeshing");
*/ #endif
RNA_def_boolean(ot->srna, RNA_def_boolean(ot->srna,
"preserve_paint_mask", "preserve_paint_mask",
false, false,