Merge branch 'master' into blender2.8

[blender.git] / source / blender / editors / transform / transform_snap_object.c

diff --git a/source/blender/editors/transform/transform_snap_object.c b/source/blender/editors/transform/transform_snap_object.c
index bdefd169f225679656d2663fb6551be744244479..96f51b99158442878663d7282d0408bc72cd6f21 100644 (file)
--- a/source/blender/editors/transform/transform_snap_object.c
+++ b/source/blender/editors/transform/transform_snap_object.c
@@ -570,8 +570,7 @@ static bool raycastEditMesh(
        }
 
        SnapObjectData_EditMesh *sod = NULL;
        }
 
        SnapObjectData_EditMesh *sod = NULL;

-
-       BVHTreeFromEditMesh *treedata;
+       BVHTreeFromEditMesh *treedata = NULL;

 
        void **sod_p;
        if (BLI_ghash_ensure_p(sctx->cache.object_map, ob, &sod_p)) {
 
        void **sod_p;
        if (BLI_ghash_ensure_p(sctx->cache.object_map, ob, &sod_p)) {


@@ -1840,8 +1839,7 @@ static bool snapEditMesh(
        float local_scale = normalize_v3(ray_normal_local);
 
        SnapObjectData_EditMesh *sod = NULL;
        float local_scale = normalize_v3(ray_normal_local);
 
        SnapObjectData_EditMesh *sod = NULL;

-
-       BVHTreeFromEditMesh *treedata;
+       BVHTreeFromEditMesh *treedata = NULL;

 
        void **sod_p;
        if (BLI_ghash_ensure_p(sctx->cache.object_map, ob, &sod_p)) {
 
        void **sod_p;
        if (BLI_ghash_ensure_p(sctx->cache.object_map, ob, &sod_p)) {