[Bf-blender-cvs] [f39d06589ed] blender2.8: Fix warnings in draw_cache_impl files

[Luca Rood]

Commit: f39d06589eda009d563a7e55784b1bb2373fd9ba
Author: Luca Rood
Date:   Thu Jun 29 15:46:00 2017 +0200
Branches: blender2.8
https://developer.blender.org/rBf39d06589eda009d563a7e55784b1bb2373fd9ba

Fix warnings in draw_cache_impl files

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

M       source/blender/draw/intern/draw_cache_impl_mesh.c
M       source/blender/draw/intern/draw_cache_impl_particles.c

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

diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c 
b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 6c62cf3b0f6..32bc0603532 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1912,6 +1912,7 @@ static Gwn_VertBuf *mesh_batch_cache_get_tri_uv_active(
                vbo_len_used = vidx;
 
                BLI_assert(vbo_len_capacity == vbo_len_used);
+               UNUSED_VARS_NDEBUG(vbo_len_used);
        }
 
        return cache->tri_aligned_uv;
diff --git a/source/blender/draw/intern/draw_cache_impl_particles.c 
b/source/blender/draw/intern/draw_cache_impl_particles.c
index 178d0a19e80..afee6ea182b 100644
--- a/source/blender/draw/intern/draw_cache_impl_particles.c
+++ b/source/blender/draw/intern/draw_cache_impl_particles.c
@@ -184,9 +184,9 @@ static void 
particle_batch_cache_ensure_pos_and_seg(ParticleSystem *psys, Modifi
 
                static Gwn_VertFormat format = { 0 };
                static struct { uint pos, tan, ind; } attr_id;
-               unsigned int *uv_id;
+               unsigned int *uv_id = NULL;
                int uv_layers = 0;
-               MTFace **mtfaces;
+               MTFace **mtfaces = NULL;
                float (**parent_uvs)[2] = NULL;
                bool simple = psys->part->childtype == PART_CHILD_PARTICLES;
 
@@ -242,7 +242,7 @@ static void 
particle_batch_cache_ensure_pos_and_seg(ParticleSystem *psys, Modifi
                                if (path->segments > 0) {
                                        float tangent[3];
                                        int from = psmd ? 
psmd->psys->part->from : 0;
-                                       float (*uv)[2];
+                                       float (*uv)[2] = NULL;
 
                                        if (psmd) {
                                                uv = MEM_callocN(sizeof(*uv) * 
uv_layers, "Particle UVs");
@@ -328,7 +328,7 @@ static void 
particle_batch_cache_ensure_pos_and_seg(ParticleSystem *psys, Modifi
 
                                if (path->segments > 0) {
                                        int from = psmd ? 
psmd->psys->part->from : 0;
-                                       float (*uv)[2];
+                                       float (*uv)[2] = NULL;
 
                                        if (!simple) {
                                                if (psmd) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs