diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-05-17 19:13:10 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-05-17 19:13:10 +0300 |
| commit | 60cd996c0aa1291c514c3a38625e6657a28230f7 (patch) | |
| tree | d83ec92d5ebe6c5ca0de644460cc5fa2c6966c97 /source/blender/draw | |
| parent | 970a7c8bb9c6c7d6dd309e6a8991cb13389fcfa0 (diff) | |
Silence warnings in Mac (based on buildbot build report)
Diffstat (limited to 'source/blender/draw')
| -rw-r--r-- | source/blender/draw/engines/external/external_engine.c | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_cache_impl_mesh.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c index f94194e29fc..c48518ef5e7 100644 --- a/source/blender/draw/engines/external/external_engine.c +++ b/source/blender/draw/engines/external/external_engine.c @@ -177,7 +177,7 @@ static void external_draw_scene(void *vedata) /* Set render info. */ EXTERNAL_Data *data = vedata; - if (rv3d->render_engine->text) { + if (rv3d->render_engine->text[0] != '\0') { BLI_strncpy(data->info, rv3d->render_engine->text, sizeof(data->info)); } else { diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c index 31d3a61b7c7..6f40825b3de 100644 --- a/source/blender/draw/intern/draw_cache_impl_mesh.c +++ b/source/blender/draw/intern/draw_cache_impl_mesh.c @@ -2325,8 +2325,9 @@ static void mesh_batch_cache_create_overlay_ledge_buffers( for (int i = 0; i < ledge_len; ++i) { int vert_idx[2]; - bool ok = mesh_render_data_edge_verts_indices_get(rdata, rdata->loose_edges[i], vert_idx); + const bool ok = mesh_render_data_edge_verts_indices_get(rdata, rdata->loose_edges[i], vert_idx); BLI_assert(ok); /* we don't add */ + UNUSED_VARS_NDEBUG(ok); add_overlay_loose_edge( rdata, vbo_pos, vbo_nor, vbo_data, attr_id.pos, attr_id.vnor, attr_id.data, |