[Bf-blender-cvs] [f8920bd8c77] master: Cleanup: fix compiler warnings

Brecht Van Lommel noreply at git.blender.org
Fri Aug 16 12:44:24 CEST 2019


Commit: f8920bd8c7757af976404572697b69372f542df2
Author: Brecht Van Lommel
Date:   Fri Aug 16 12:44:06 2019 +0200
Branches: master
https://developer.blender.org/rBf8920bd8c7757af976404572697b69372f542df2

Cleanup: fix compiler warnings

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

M	source/blender/editors/object/object_remesh.c
M	source/blender/editors/space_view3d/view3d_draw_legacy.c

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

diff --git a/source/blender/editors/object/object_remesh.c b/source/blender/editors/object/object_remesh.c
index 1bcac9b4739..bc94b3f7875 100644
--- a/source/blender/editors/object/object_remesh.c
+++ b/source/blender/editors/object/object_remesh.c
@@ -108,7 +108,7 @@ static int voxel_remesh_exec(bContext *C, wmOperator *op)
     return OPERATOR_CANCELLED;
   }
 
-  Mesh *obj_mesh_copy;
+  Mesh *obj_mesh_copy = NULL;
   if (mesh->flag & ME_REMESH_REPROJECT_PAINT_MASK) {
     obj_mesh_copy = BKE_mesh_new_nomain_from_template(mesh, mesh->totvert, 0, 0, 0, 0);
     CustomData_copy(
diff --git a/source/blender/editors/space_view3d/view3d_draw_legacy.c b/source/blender/editors/space_view3d/view3d_draw_legacy.c
index 02ad481e6ce..d5772e5052a 100644
--- a/source/blender/editors/space_view3d/view3d_draw_legacy.c
+++ b/source/blender/editors/space_view3d/view3d_draw_legacy.c
@@ -162,6 +162,7 @@ static void validate_object_select_id(
   Object *obact_eval = DEG_get_evaluated_object(depsgraph, obact);
 
   BLI_assert(ar->regiontype == RGN_TYPE_WINDOW);
+  UNUSED_VARS_NDEBUG(ar);
 
   if (obact_eval && (obact_eval->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT) ||
                      BKE_paint_select_face_test(obact_eval))) {



More information about the Bf-blender-cvs mailing list