diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-10 13:41:32 +0300 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2016-10-10 13:41:32 +0300 |
commit | 6371f8ff8add8e64213496a0de153715ca794d39 (patch) | |
tree | d3bdf9bc8b5a96b23f7dc4c6a8283fda06d7c461 /source/blender/render | |
parent | ecbad54df91e4eacb6fb5404bc6338ee4c052e0a (diff) | |
parent | 109192b3601ddfa8ec44ab2fd276298ac690a9a2 (diff) |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/view3d_draw.c
Diffstat (limited to 'source/blender/render')
-rw-r--r-- | source/blender/render/intern/raytrace/rayobject_rtbuild.cpp | 12 | ||||
-rw-r--r-- | source/blender/render/intern/source/pointdensity.c | 11 | ||||
-rw-r--r-- | source/blender/render/intern/source/render_result.c | 2 |
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 80c1d4e00a1..ffb44cf6826 100644 --- a/source/blender/render/intern/source/pointdensity.c +++ b/source/blender/render/intern/source/pointdensity.c @@ -188,7 +188,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; |