Commit: ecfe74cf747ef360e7c9bdce46fd9a67cd89520e
Author: Ray Molenkamp
Date: Thu May 30 09:48:21 2019 -0600
Branches: soc-2019-npr
https://developer.blender.org/rBecfe74cf747ef360e7c9bdce46fd9a67cd89520e
Fix remaining pointer conversion errors for MSVC
===================================================================
M source/blender/draw/engines/lanpr/lanpr_access.c
M source/blender/draw/engines/lanpr/lanpr_chain.c
M source/blender/draw/engines/lanpr/lanpr_ops.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.c
b/source/blender/draw/engines/lanpr/lanpr_access.c
index 6bd7b82c155..5d667a8a040 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.c
+++ b/source/blender/draw/engines/lanpr/lanpr_access.c
@@ -82,7 +82,7 @@ void lanpr_generate_gpencil_geometry(
BMVert *cur_vert = v1;
for (rls = rl->segments.first; rls; rls =
(LANPR_RenderLineSegment*)rls->item.next) {
- irls = rls->item.next;
+ irls = (LANPR_RenderLineSegment *)rls->item.next;
if (rls->occlusion != 0) {
BM_elem_flag_disable(cur_vert, BM_ELEM_SELECT);
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c
b/source/blender/draw/engines/lanpr/lanpr_chain.c
index c934d4c4c04..3f315187e15 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -165,7 +165,7 @@ void
lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc,
}
if (!max_rlci) {
- if (from->item.next == to)
+ if ((LANPR_RenderLineChainItem *)from->item.next == to)
return;
for (rlci = (LANPR_RenderLineChainItem*)from->item.next; rlci != to; rlci
= next_rlci) {
next_rlci = (LANPR_RenderLineChainItem*)rlci->item.next;
@@ -176,9 +176,9 @@ void
lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc,
}
}
else {
- if (from->item.next != max_rlci)
+ if ((LANPR_RenderLineChainItem *)from->item.next != max_rlci)
lanpr_reduce_render_line_chain_recursive(rlc, from, max_rlci,
dist_threshold);
- if (to->item.prev != max_rlci)
+ if ((LANPR_RenderLineChainItem *)to->item.prev != max_rlci)
lanpr_reduce_render_line_chain_recursive(rlc, max_rlci, to,
dist_threshold);
}
}
@@ -441,7 +441,7 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer
*rb)
total_length = lanpr_compute_chain_length(rlc, lengths, i);
- for (rlci = rlc->chain.first; rlci; rlci =
(LANPR_RenderLineChain*)rlci->item.next) {
+ for (rlci = rlc->chain.first; rlci; rlci =
(LANPR_RenderLineChainItem*)rlci->item.next) {
length_target[0] = lengths[i];
length_target[1] = total_length - lengths[i];
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c
b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 8b3d512645a..3b3acd9dce7 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -865,7 +865,7 @@ void lanpr_cut_render_line(LANPR_RenderBuffer *rb,
LANPR_RenderLine *rl, real Be
if (!rls->item.next) {
break;
}
- irls = rls->item.next;
+ irls = (LANPR_RenderLineSegment *) rls->item.next;
if (irls->at > Begin + 1e-09 && Begin > rls->at) {
begin_segment = irls;
ns = mem_static_aquire_thread(&rb->render_data_pool,
sizeof(LANPR_RenderLineSegment));
@@ -3541,7 +3541,7 @@ void
*lanpr_make_leveled_edge_vertex_array(LANPR_RenderBuffer *rb,
if (!lanpr_count_this_line(rl, ll))
continue;
- for (rls = rl->segments.first; rls; rls = rls->item.next) {
+ for (rls = rl->segments.first; rls; rls = (LANPR_RenderLineSegment
*)rls->item.next) {
if (rls->occlusion >= ll->qi_begin && rls->occlusion <= ll->qi_end) {
if (rl->tl) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
