[Bf-blender-cvs] [0aaea4b] soc-2016-pbvh-painting: Fixed memory leak on map.

[Nathan Vollmer]

Commit: 0aaea4ba2d370d2cc9dfef1764f46808b8985226
Author: Nathan Vollmer
Date:   Thu Jun 23 12:03:11 2016 -0600
Branches: soc-2016-pbvh-painting
https://developer.blender.org/rB0aaea4ba2d370d2cc9dfef1764f46808b8985226

Fixed memory leak on map.

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

M       release/datafiles/locale
M       release/scripts/addons
M       release/scripts/addons_contrib
M       source/blender/editors/sculpt_paint/paint_vertex.c
M       source/blender/editors/sculpt_paint/sculpt.c

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 9628dc1..c0fe794 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 9628dc1922be2fb6281bc66f5f7512c2a57c294a
+Subproject commit c0fe79491797b2405087ce4c40a913c7f88ee9d0
diff --git a/release/scripts/addons b/release/scripts/addons
index 407d0ea..ce3e1a0 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 407d0ea752b3af73d3f13ba072671bd09eefecb1
+Subproject commit ce3e1a0d88579751fbcc7ebbdfa37a8235d3a1c0
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 9f29e18..e5ed675 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 9f29e18707917ec5be262431d2e09dbb85332f41
+Subproject commit e5ed67560f3f414390750537a938ff0e58d733ba
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c 
b/source/blender/editors/sculpt_paint/paint_vertex.c
index 4f53c7c..12374aa 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -2081,7 +2081,6 @@ static void vwpaint_update_cache_invariants(bContext *C, 
VPaint *vd, SculptSessi
        copy_v3_v3(cache->view_normal, cache->true_view_normal);
        cache->bstrength = BKE_brush_alpha_get(scene, brush);
 
-
        if (!cache->vert_to_loop) {
                Mesh *me = ob->data;
                cache->tot_verts = me->totvert;
diff --git a/source/blender/editors/sculpt_paint/sculpt.c 
b/source/blender/editors/sculpt_paint/sculpt.c
index b04d383..1d8a1f6 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -3797,8 +3797,10 @@ void sculpt_cache_free(StrokeCache *cache)
                MEM_freeN(cache->dial);
 
        // vwpaint loop mapping
-       if (cache->vert_to_loop)
+       if (cache->vert_to_loop) {
                MEM_freeN(cache->vert_to_loop);
+               MEM_freeN(cache->map_mem);
+       }
 
        //For vw paint blending
        if (cache->totloopsHit)

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