[Bf-blender-cvs] [f0a225f5248] soc-2019-npr: LANPR: modified "item" into prev/next in lanpr_data_types.h
Yiming Wu
noreply at git.blender.org
Wed Jun 26 15:52:10 CEST 2019
Commit: f0a225f52480e8f583b732fe881b83ec707dee65
Author: Yiming Wu
Date: Wed Jun 26 21:50:13 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBf0a225f52480e8f583b732fe881b83ec707dee65
LANPR: modified "item" into prev/next in lanpr_data_types.h
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
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_data_types.h
M source/blender/draw/engines/lanpr/lanpr_ops.c
M source/blender/draw/engines/lanpr/lanpr_snake.c
M source/tools
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index ad82c4ce43e..d1f85e37b7f 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit ad82c4ce43ef2801ef51e75af1f9702992478b02
+Subproject commit d1f85e37b7fa2574243a112670fd36fbebc61d4c
diff --git a/release/scripts/addons b/release/scripts/addons
index 8e6f485cf5b..4fe2c612f13 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 8e6f485cf5b160c425d7da7c743879b20f3d6a96
+Subproject commit 4fe2c612f133640c0ab5d4bba3c0eb121bfe555d
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index 7077ff07384..e83541d42c7 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit 7077ff07384491d1f7630484995557f1c7302dae
+Subproject commit e83541d42c71bfb689acf9a53a6eb66b0c190451
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.c b/source/blender/draw/engines/lanpr/lanpr_access.c
index 6dbc2f33b2d..eb737377ff9 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.c
+++ b/source/blender/draw/engines/lanpr/lanpr_access.c
@@ -73,7 +73,7 @@ void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
LANPR_RenderLineChain *rlc;
LANPR_RenderLineChainItem *rlci;
- for (rlc = rb->chains.first; rlc; rlc = (LANPR_RenderLineChain *)rlc->item.next) {
+ for (rlc = rb->chains.first; rlc; rlc = rlc->next) {
if (rlc->picked) {
continue;
@@ -101,7 +101,7 @@ void lanpr_generate_gpencil_from_chain(Depsgraph *depsgraph,
float *stroke_data = BLI_array_alloca(stroke_data, count * GP_PRIM_DATABUF_SIZE);
- for (rlci = rlc->chain.first; rlci; rlci = (LANPR_RenderLineChainItem *)rlci->item.next) {
+ for (rlci = rlc->chain.first; rlci; rlci = rlci->next) {
float opatity = 1.0f; /* rlci->occlusion ? 0.0f : 1.0f; */
stroke_data[array_idx] = rlci->gpos[0];
stroke_data[array_idx + 1] = rlci->gpos[1];
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c b/source/blender/draw/engines/lanpr/lanpr_chain.c
index 651c0c1aae2..467ea0c6816 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -165,8 +165,8 @@ void lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc,
LANPR_RenderLineChainItem *max_rlci = 0;
/* find the max distance item */
- for (rlci = (LANPR_RenderLineChainItem *)from->item.next; rlci != to; rlci = next_rlci) {
- next_rlci = (LANPR_RenderLineChainItem *)rlci->item.next;
+ for (rlci = from->next; rlci != to; rlci = next_rlci) {
+ next_rlci = rlci->next;
if (next_rlci &&
(next_rlci->occlusion != rlci->occlusion || next_rlci->line_type != rlci->line_type)) {
@@ -182,11 +182,11 @@ void lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc,
}
if (!max_rlci) {
- if ((LANPR_RenderLineChainItem *)from->item.next == to) {
+ if (from->next == to) {
return;
}
- for (rlci = (LANPR_RenderLineChainItem *)from->item.next; rlci != to; rlci = next_rlci) {
- next_rlci = (LANPR_RenderLineChainItem *)rlci->item.next;
+ for (rlci = from->next; rlci != to; rlci = next_rlci) {
+ next_rlci = rlci->next;
if (next_rlci &&
(next_rlci->occlusion != rlci->occlusion || next_rlci->line_type != rlci->line_type)) {
continue;
@@ -195,10 +195,10 @@ void lanpr_reduce_render_line_chain_recursive(LANPR_RenderLineChain *rlc,
}
}
else {
- if ((LANPR_RenderLineChainItem *)from->item.next != max_rlci) {
+ if (from->next != max_rlci) {
lanpr_reduce_render_line_chain_recursive(rlc, from, max_rlci, dist_threshold);
}
- if ((LANPR_RenderLineChainItem *)to->item.prev != max_rlci) {
+ if (to->prev != max_rlci) {
lanpr_reduce_render_line_chain_recursive(rlc, max_rlci, to, dist_threshold);
}
}
@@ -214,7 +214,7 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
real *inv = rb->vp_inverse;
int last_occlusion;
- for (rl = rb->all_render_lines.first; rl; rl = (LANPR_RenderLine *)rl->item.next) {
+ for (rl = rb->all_render_lines.first; rl; rl = rl->next) {
if ((!(rl->flags & LANPR_EDGE_FLAG_ALL_TYPE)) || (rl->flags & LANPR_EDGE_FLAG_CHAIN_PICKED)) {
continue;
@@ -278,7 +278,7 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
}
if (new_rv == new_rl->l) {
- for (rls = new_rl->segments.last; rls; rls = (LANPR_RenderLineSegment *)rls->item.prev) {
+ for (rls = new_rl->segments.last; rls; rls = rls->prev) {
double gpos[3], lpos[3];
lanpr_LinearInterpolate3dv(new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at, lpos);
lanpr_LinearInterpolate3dv(new_rl->l->gloc, new_rl->r->gloc, rls->at, gpos);
@@ -298,8 +298,8 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
else if (new_rv == new_rl->r) {
rls = new_rl->segments.first;
last_occlusion = rls->occlusion;
- rls = (LANPR_RenderLineSegment *)rls->item.next;
- for (rls; rls; rls = (LANPR_RenderLineSegment *)rls->item.next) {
+ rls = rls->next;
+ for (rls; rls; rls = rls->next) {
double gpos[3], lpos[3];
lanpr_LinearInterpolate3dv(new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at, lpos);
lanpr_LinearInterpolate3dv(new_rl->l->gloc, new_rl->r->gloc, rls->at, gpos);
@@ -332,8 +332,7 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
/* step 2: this line */
rls = rl->segments.first;
last_occlusion = ((LANPR_RenderLineSegment *)rls)->occlusion;
- for (rls = (LANPR_RenderLineSegment *)rls->item.next; rls;
- rls = (LANPR_RenderLineSegment *)rls->item.next) {
+ for (rls = rls->next; rls; rls = rls->next) {
double gpos[3], lpos[3];
lanpr_LinearInterpolate3dv(rl->l->fbcoord, rl->r->fbcoord, rls->at, lpos);
lanpr_LinearInterpolate3dv(rl->l->gloc, rl->r->gloc, rls->at, gpos);
@@ -369,13 +368,11 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
rls = new_rl->segments.last;
last_occlusion = rls->occlusion;
rlci->occlusion = last_occlusion; /* fix leading vertex occlusion */
- for (rls = new_rl->segments.last; rls; rls = (LANPR_RenderLineSegment *)rls->item.prev) {
+ for (rls = new_rl->segments.last; rls; rls = rls->prev) {
double gpos[3], lpos[3];
lanpr_LinearInterpolate3dv(new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at, lpos);
lanpr_LinearInterpolate3dv(new_rl->l->gloc, new_rl->r->gloc, rls->at, gpos);
- last_occlusion = (LANPR_RenderLineSegment *)rls->item.prev ?
- ((LANPR_RenderLineSegment *)rls->item.prev)->occlusion :
- last_occlusion;
+ last_occlusion = rls->prev ? rls->prev->occlusion : last_occlusion;
lanpr_append_render_line_chain_point(rb,
rlc,
lpos[0],
@@ -392,8 +389,8 @@ void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
rls = new_rl->segments.first;
last_occlusion = rls->occlusion;
rlci->occlusion = last_occlusion;
- rls = (LANPR_RenderLineSegment *)rls->item.next;
- for (rls; rls; rls = (LANPR_RenderLineSegment *)rls->item.next) {
+ rls = rls->next;
+ for (rls; rls; rls = rls->next) {
double gpos[3], lpos[3];
lanpr_LinearInterpolate3dv(new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at, lpos);
lanpr_LinearInterpolate3dv(new_rl->l->gloc, new_rl->r->gloc, rls->at, gpos);
@@ -521,20 +518,20 @@ void lanpr_split_chains_for_fixed_occlusion(LANPR_RenderBuffer *rb)
rb->chains.last = rb->chains.first = NULL;
while (rlc = BLI_pophead(&swap)) {
- rlc->item.next = rlc->item.prev = NULL;
+ rlc->next = rlc->prev = NULL;
BLI_addtail(&rb->chains, rlc);
LANPR_RenderLineChainItem *first_rlci = (LANPR_RenderLineChainItem *)rlc->chain.first;
int fixed_occ = first_rlci->occlusion;
rlc->level = fixed_occ;
- for (rlci = (LANPR_RenderLineChainItem *)first_rlci->item.next; rlci; rlci = next_rlci) {
- next_rlci = (LANPR_RenderLineChainItem *)rlci->item.next;
+ for (rlci = first_rlci->next; rlci; rlci = next_rlci) {
+ next_rlci = rlci->next;
if (rlci->occlusion != fixed_occ) {
new_rlc = lanpr_create_render_line_chain(rb);
new_rlc->chain.first = rlci;
new_rlc->chain.last = rlc->chain.last;
- rlc->chain.last = rlci->item.prev;
- ((LANPR_RenderLineChainItem *)rlc->chain.last)->item.next = 0;
- rlci->item.prev = 0;
+ rlc->chain.last = rlci->prev;
+ ((LANPR_RenderLineChainItem *)rlc->chain.last)->next = 0;
+ rlci->prev = 0;
/* end the previous one */
lanpr_append_render_line_chain_point(rb,
@@ -554,7 +551,7 @@ void lanpr_split_chains_for_fixed_occlusion(LANPR_RenderBuffer *rb)
}
}
}
- for (rlc = rb->chains.first; rlc; rlc = (LANPR_RenderLineChain *)rlc->item.next) {
+ for (rlc = rb->chains.first; rlc; rlc = rlc->next) {
lanpr_link_chain_with_bounding_areas(rb, rlc);
}
}
@@ -570,16 +567,16 @@ void lanpr_connect_two_chains(LANPR_RenderBuffer *rb,
if (reverse_2) { /* L--R R-L */
BLI_listbase_reverse(&sub->chain);
}
- ((LANPR_RenderLineChainItem *)onto->chain.last)->item.next = sub->chain.first;
- ((LANPR_RenderLineChainItem *)sub->chain.first)->item.prev = onto->chain.last;
+ ((LANPR_RenderLineChainItem *)onto->chain.last)->next = sub->chain.first;
+ ((LANPR_RenderLineChainItem *)sub->chain.first)->prev = onto->chain.last;
onto->chain.last = sub->chain.last;
}
else { /* L-R L--R */
if (!reverse_2) { /* R-L L--R */
BLI_listbase_reverse(&sub->chain);
}
- ((LANPR_RenderLineChainItem *)sub->chain.last)->item.next = onto->chain.first;
- ((LANPR_RenderLineChainItem *)onto->chain.first)->item.prev = sub->chain.last;
+ ((LANPR_RenderLineChainItem *)sub->chain.last)->next = onto->ch
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list