3 files changed, 18 insertions, 7 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
index 724a809077e..81e41a20f2e 100644
--- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
+++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp
@@ -31,10 +31,16 @@
 
 
 #include <assert.h>
-#include <math.h>
 #include <stdlib.h>
 #include <algorithm>
 
+#if __cplusplus >= 201103L
+#include <cmath>
+using std::isfinite;
+#else
+#include <math.h>
+#endif
+
 #include "rayobject_rtbuild.h"
 
 #include "MEM_guardedalloc.h"
@@ -42,10 +48,6 @@
 #include "BLI_math.h"
 #include "BLI_utildefines.h"
 
-#if __cplusplus >= 201103L
-using std::isfinite;
-#endif
-
 static bool selected_node(RTBuilder::Object *node)
 {
 	return node->selected;
diff --git a/source/blender/render/intern/source/pointdensity.c b/source/blender/render/intern/source/pointdensity.c
index e4da4302efe..a03ea9cb896 100644
--- a/source/blender/render/intern/source/pointdensity.c
+++ b/source/blender/render/intern/source/pointdensity.c
@@ -333,7 +333,16 @@ static void pointdensity_cache_vertex_color(PointDensity *pd, Object *UNUSED(ob)
 	
 	for (i = 0; i < totloop; i++) {
 		int v = mloop[i].v;
-		rgb_uchar_to_float(&data_color[v*3], &mcol[i].r);
+
+		if (mcorners[v] == 0) {
+			rgb_uchar_to_float(&data_color[v * 3], &mcol[i].r);
+		}
+		else {
+			float col[3];
+			rgb_uchar_to_float(col, &mcol[i].r);
+			add_v3_v3(&data_color[v * 3], col);
+		}
+
 		++mcorners[v];
 	}
 	
diff --git a/source/blender/render/intern/source/render_result.c b/source/blender/render/intern/source/render_result.c
index e3fc8174bd6..2be6238eeec 100644
--- a/source/blender/render/intern/source/render_result.c
+++ b/source/blender/render/intern/source/render_result.c
@@ -1721,7 +1721,7 @@ static RenderView *duplicate_render_view(RenderView *rview)
 
 RenderResult *RE_DuplicateRenderResult(RenderResult *rr)
 {
-	RenderResult *new_rr = MEM_mallocN(sizeof(RenderResult), "new render result");
+	RenderResult *new_rr = MEM_mallocN(sizeof(RenderResult), "new duplicated render result");
 	*new_rr = *rr;
 	new_rr->next = new_rr->prev = NULL;
 	new_rr->layers.first = new_rr->layers.last = NULL;