[Bf-blender-cvs] [7c9b8aa] master: Fix possible uninitialized var use

[Campbell Barton]

Commit: 7c9b8aa6ccb83b92ec8f42594348263e6ff638aa
Author: Campbell Barton
Date:   Wed Aug 13 10:38:08 2014 +1000
Branches: master
https://developer.blender.org/rB7c9b8aa6ccb83b92ec8f42594348263e6ff638aa

Fix possible uninitialized var use

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

M       source/blender/freestyle/intern/stroke/Stroke.h
M       source/blender/gpu/intern/gpu_buffers.c

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

diff --git a/source/blender/freestyle/intern/stroke/Stroke.h 
b/source/blender/freestyle/intern/stroke/Stroke.h
index f919cd3..86c667a 100644
--- a/source/blender/freestyle/intern/stroke/Stroke.h
+++ b/source/blender/freestyle/intern/stroke/Stroke.h
@@ -664,7 +664,7 @@ public:
        /*! Returns true if this Stroke has textures assigned, false otherwise. 
*/
        inline bool hasTex() const
        {
-               return (_mtex && _mtex[0] != NULL) || _nodeTree;
+               return (_mtex[0] != NULL) || _nodeTree;
        }
 
        /*! Returns true if this Stroke uses a texture with tips, false 
otherwise. */
diff --git a/source/blender/gpu/intern/gpu_buffers.c 
b/source/blender/gpu/intern/gpu_buffers.c
index 91eb2a4..698e72a 100644
--- a/source/blender/gpu/intern/gpu_buffers.c
+++ b/source/blender/gpu/intern/gpu_buffers.c
@@ -2682,6 +2682,9 @@ bool GPU_pbvh_buffers_diffuse_changed(GPU_PBVH_Buffers 
*buffers, GSet *bm_faces,
                        f = BLI_gsetIterator_getKey(&gs_iter);
                        GPU_material_diffuse_get(f->mat_nr + 1, diffuse_color);
                }
+               else {
+                       return false;
+               }
        }
        else {
                const DMFlagMat *flags = 
&buffers->grid_flag_mats[buffers->grid_indices[0]];
@@ -2689,9 +2692,7 @@ bool GPU_pbvh_buffers_diffuse_changed(GPU_PBVH_Buffers 
*buffers, GSet *bm_faces,
                GPU_material_diffuse_get(flags->mat_nr + 1, diffuse_color);
        }
 
-       return diffuse_color[0] != buffers->diffuse_color[0] ||
-              diffuse_color[1] != buffers->diffuse_color[1] ||
-              diffuse_color[2] != buffers->diffuse_color[2];
+       return !equals_v3v3(diffuse_color, buffers->diffuse_color);
 }
 
 /* release a GPU_PBVH_Buffers id;

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