archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix warnings in draw_cache_impl files

Browse Source
This commit is contained in:
Luna Rood
2017-06-29 15:46:00 +02:00
parent b606161458
commit f39d06589e
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/draw/intern/draw_cache_impl_mesh.c
View File

@@ -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;

8
source/blender/draw/intern/draw_cache_impl_particles.c
View File

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