[Bf-blender-cvs] [d1152b069a6] lanpr-under-gp: LineArt: type compatible with MSVC

[YimingWu]

Commit: d1152b069a605766eb3b3c2c789f3bc3a94f9650
Author: YimingWu
Date:   Fri Oct 23 07:51:11 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBd1152b069a605766eb3b3c2c789f3bc3a94f9650

LineArt: type compatible with MSVC

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

M       source/blender/editors/lineart/lineart_cpu.c

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

diff --git a/source/blender/editors/lineart/lineart_cpu.c 
b/source/blender/editors/lineart/lineart_cpu.c
index 0cb7fa7c444..0ecb35a2910 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -366,7 +366,7 @@ static void 
lineart_occlusion_single_line(LineartRenderBuffer *rb,
     LISTBASE_FOREACH (LinkData *, lip, &nba->linked_triangles) {
       rt = lip->data;
       if (rt->testing[thread_id] == rl || (rt->base.flags & 
LRT_TRIANGLE_INTERSECTION_ONLY) ||
-          lineart_occlusion_is_adjacent_intersection(rl, rt)) {
+          lineart_occlusion_is_adjacent_intersection(rl, 
(LineartRenderTriangle *)rt)) {
         continue;
       }
       rt->testing[thread_id] = rl;
@@ -2242,7 +2242,7 @@ static LineartRenderVert 
*lineart_triangle_2v_intersection_test(LineartRenderBuf
     if (rv->intersecting_with == rt &&
         lineart_vert_already_intersected_2v(
             rv, (LineartRenderVertIntersection *)l, 
(LineartRenderVertIntersection *)r)) {
-      return rv;
+      return (LineartRenderVert *)rv;
     }
   }

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