griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup, compiler warnings in release mode

Browse Source
This commit is contained in:
Sergey Sharybin
2018-11-08 15:49:25 +01:00
parent 146b39a45d
commit d4370e2e00
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/paint_toolslots.c
View File

@@ -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++) {

1
source/blender/makesrna/intern/rna_sculpt_paint.c
View File

@@ -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) {