diff options
| -rw-r--r-- | source/blender/blenfont/intern/blf.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 12 | ||||
| -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 |
4 files changed, 12 insertions, 7 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index e6dffedc5d9..43060870449 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -575,6 +575,8 @@ static void blf_draw_gl__start(FontBLF *font) BLI_assert(texCoord == BLF_COORD_ID); BLI_assert(color == BLF_COLOR_ID); + UNUSED_VARS_NDEBUG(pos, texCoord, color); + immBindBuiltinProgram(GPU_SHADER_TEXT); #endif diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index ff29affd6d9..007499614c2 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -313,11 +313,12 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) /* recursively creates a new SceneCollection tree */ scene_collection_copy(mcn, mc); + IDPropertyTemplate val = {0}; BLI_duplicatelist(&scen->render_layers, &sce->render_layers); SceneLayer *new_sl = scen->render_layers.first; for (SceneLayer *sl = sce->render_layers.first; sl; sl = sl->next) { new_sl->stats = NULL; - new_sl->properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); + new_sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); new_sl->properties_evaluated = NULL; /* we start fresh with no overrides and no visibility flags set @@ -339,8 +340,8 @@ Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type) new_sl = new_sl->next; } - scen->collection_properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); - scen->layer_properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); + scen->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); + scen->layer_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); } /* copy color management settings */ @@ -959,10 +960,11 @@ void BKE_scene_init(Scene *sce) BLI_strncpy(sce->collection->name, "Master Collection", sizeof(sce->collection->name)); /* Engine settings */ - sce->collection_properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); + IDPropertyTemplate val = {0}; + sce->collection_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); BKE_layer_collection_engine_settings_create(sce->collection_properties); - sce->layer_properties = IDP_New(IDP_GROUP, (const IDPropertyTemplate *){0}, ROOT_PROP); + sce->layer_properties = IDP_New(IDP_GROUP, &val, ROOT_PROP); BKE_scene_layer_engine_settings_create(sce->layer_properties); BKE_scene_layer_add(sce, "Render Layer"); 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, |