[Bf-blender-cvs] [f037fdf] strand_gpu: initialize variables before use

[Mike Erwin]

Commit: f037fdfa5306ced5afcf1577f2e976a8d996f536
Author: Mike Erwin
Date:   Thu Jul 7 19:20:57 2016 -0400
Branches: strand_gpu
https://developer.blender.org/rBf037fdfa5306ced5afcf1577f2e976a8d996f536

initialize variables before use

Now builds with MSVC 2015 (was treating warning as error).

Strand root returned from this function is safer: NULL when len <= 0.

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

M       source/blender/bmesh/intern/bmesh_strands.c

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

diff --git a/source/blender/bmesh/intern/bmesh_strands.c 
b/source/blender/bmesh/intern/bmesh_strands.c
index cc58b27..d54c7ee 100644
--- a/source/blender/bmesh/intern/bmesh_strands.c
+++ b/source/blender/bmesh/intern/bmesh_strands.c
@@ -136,12 +136,10 @@ BMVert *BM_strands_create(BMesh *bm, int len, bool 
set_defaults)
 {
        float co[3] = {0.0f, 0.0f, 0.0f};
        
-       BMVert *root, *v, *vprev;
-       int k;
+       BMVert *root = NULL, *vprev = NULL;
        
-       for (k = 0; k < len; ++k) {
-               vprev = v;
-               v = BM_vert_create(bm, co, NULL, set_defaults ? BM_CREATE_NOP : 
BM_CREATE_SKIP_CD);
+       for (int k = 0; k < len; ++k) {
+               BMVert *v = BM_vert_create(bm, co, NULL, set_defaults ? 
BM_CREATE_NOP : BM_CREATE_SKIP_CD);
                
                zero_v3(v->no);
                
@@ -152,6 +150,8 @@ BMVert *BM_strands_create(BMesh *bm, int len, bool 
set_defaults)
                else {
                        /*BMEdge *e =*/ BM_edge_create(bm, vprev, v, NULL, 
set_defaults ? BM_CREATE_NOP : BM_CREATE_SKIP_CD);
                }
+
+               vprev = v;
        }
        
        return root;

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