[Bf-blender-cvs] [d4370e2e008] blender2.8: Cleanup, compiler warnings in release mode

Sergey Sharybin noreply at git.blender.org
Thu Nov 8 15:49:37 CET 2018


Commit: d4370e2e0089be66f98210f6374031186dee4758
Author: Sergey Sharybin
Date:   Thu Nov 8 15:49:25 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBd4370e2e0089be66f98210f6374031186dee4758

Cleanup, compiler warnings in release mode

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

M	source/blender/blenkernel/intern/paint_toolslots.c
M	source/blender/makesrna/intern/rna_sculpt_paint.c

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

diff --git a/source/blender/blenkernel/intern/paint_toolslots.c b/source/blender/blenkernel/intern/paint_toolslots.c
index 5f6b1d9438d..92e42a0a468 100644
--- a/source/blender/blenkernel/intern/paint_toolslots.c
+++ b/source/blender/blenkernel/intern/paint_toolslots.c
@@ -82,6 +82,7 @@ void BKE_paint_toolslots_init_from_main(struct Main *bmain)
 void BKE_paint_toolslots_brush_update_ex(Paint *paint, Brush *brush)
 {
 	const uint tool_offset = paint->runtime.tool_offset;
+	UNUSED_VARS_NDEBUG(tool_offset);
 	BLI_assert(tool_offset != 0);
 	const int slot_index = BKE_brush_tool_get(brush, paint);
 	BKE_paint_toolslots_len_ensure(paint, slot_index + 1);
@@ -107,6 +108,7 @@ void BKE_paint_toolslots_brush_validate(Main *bmain, Paint *paint)
 {
 	/* Clear slots with invalid slots or mode (unlikely but possible). */
 	const uint tool_offset = paint->runtime.tool_offset;
+	UNUSED_VARS_NDEBUG(tool_offset);
 	const eObjectMode ob_mode = paint->runtime.ob_mode;
 	BLI_assert(tool_offset && ob_mode);
 	for (int i = 0; i < paint->tool_slots_len; i++) {
diff --git a/source/blender/makesrna/intern/rna_sculpt_paint.c b/source/blender/makesrna/intern/rna_sculpt_paint.c
index 841a5be1aff..d2ed6229b13 100644
--- a/source/blender/makesrna/intern/rna_sculpt_paint.c
+++ b/source/blender/makesrna/intern/rna_sculpt_paint.c
@@ -277,6 +277,7 @@ static bool rna_Brush_mode_poll(PointerRNA *ptr, PointerRNA value)
 	Brush *brush = value.id.data;
 	const uint tool_offset = paint->runtime.tool_offset;
 	const eObjectMode ob_mode = paint->runtime.ob_mode;
+	UNUSED_VARS_NDEBUG(tool_offset);
 	BLI_assert(tool_offset && ob_mode);
 
 	if (brush->ob_mode & ob_mode) {



More information about the Bf-blender-cvs mailing list