[Bf-blender-cvs] [342a51c38c7] lanpr-under-gp: Cleanup: naming conventions in lineart_cpu.c
YimingWu
noreply at git.blender.org
Tue Jul 7 13:17:51 CEST 2020
Commit: 342a51c38c7fcde9a3b3b3cf71faf90b68c38600
Author: YimingWu
Date: Tue Jul 7 19:17:42 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB342a51c38c7fcde9a3b3b3cf71faf90b68c38600
Cleanup: naming conventions in lineart_cpu.c
===================================================================
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 851cdae9256..f284aa0998f 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -908,7 +908,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
int i;
double a;
int v_count = 0, t_count = 0;
- Object *o;
+ Object *ob;
double view_dir[3], clip_advance[3];
copy_v3_v3_db(view_dir, rb->view_vector);
@@ -930,7 +930,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
if (reln->additional) {
continue;
}
- o = reln->object_ref;
+ ob = reln->object_ref;
for (i = 0; i < reln->element_count; i++) {
/* These three represents points that are in the clipping range or not*/
@@ -1049,7 +1049,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
/* use tl or tr doesn't matter. */
rl->tl = rt1;
rt1->rl[1] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
/* new line connecting original point 0 and a new point */
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
@@ -1062,7 +1062,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tl = rt->rl[0]->tl == rt ? rt1 : rt->rl[0]->tl;
rl->tr = rt->rl[0]->tr == rt ? rt1 : rt->rl[0]->tr;
rt1->rl[0] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
/* new line connecting original point 0 and another new point */
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
@@ -1075,7 +1075,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tl = rt->rl[2]->tl == rt ? rt1 : rt->rl[2]->tl;
rl->tr = rt->rl[2]->tr == rt ? rt1 : rt->rl[2]->tr;
rt1->rl[2] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
/* re-assign triangle point array to two new points. */
rt1->v[0] = rt->v[0];
@@ -1120,7 +1120,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->r = &rv[1];
rl->tl = rt1;
rt1->rl[0] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
@@ -1131,7 +1131,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tl = rt->rl[1]->tl == rt ? rt1 : rt->rl[1]->tl;
rl->tr = rt->rl[1]->tr == rt ? rt1 : rt->rl[1]->tr;
rt1->rl[1] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
@@ -1142,7 +1142,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tl = rt->rl[2]->tl == rt ? rt1 : rt->rl[2]->tl;
rl->tr = rt->rl[2]->tr == rt ? rt1 : rt->rl[2]->tr;
rt1->rl[2] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rt1->v[0] = &rv[0]; /*&rv[1];*/
rt1->v[1] = &rv[1]; /*rt->v[2];*/
@@ -1186,7 +1186,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->r = &rv[0];
rl->tl = rt1;
rt1->rl[2] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
@@ -1197,7 +1197,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tl = rt->rl[1]->tl == rt ? rt1 : rt->rl[1]->tl;
rl->tr = rt->rl[1]->tr == rt ? rt1 : rt->rl[1]->tr;
rt1->rl[0] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
@@ -1208,7 +1208,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tl = rt->rl[0]->tl == rt ? rt1 : rt->rl[0]->tl;
rl->tr = rt->rl[0]->tr == rt ? rt1 : rt->rl[0]->tr;
rt1->rl[1] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rt1->v[0] = &rv[0]; /*rt->v[1];*/
rt1->v[1] = rt->v[1]; /*&rv[1];*/
@@ -1282,7 +1282,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->r = &rv[0];
rl->tl = rt1;
rt1->rl[1] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
/** New line connects new point 0 and old point 1,
* this is a border line.
@@ -1296,7 +1296,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tl = rt1;
rl->tr = rt->rl[0]->tr == rt ? rt->rl[0]->tl : rt->rl[0]->tr;
rt1->rl[2] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
/** New line connects new point 1 and old point 1,
* this is a inner line separating newly generated triangles.
@@ -1311,7 +1311,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tr = rt2;
rt1->rl[0] = rl;
rt2->rl[0] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
/* We now have one triangle closed. */
rt1->v[0] = rt->v[1];
@@ -1331,7 +1331,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tr = rt->rl[2]->tr == rt ? rt->rl[2]->tl : rt->rl[2]->tr;
rt2->rl[2] = rl;
rt2->rl[1] = rt->rl[1];
- rl->object_ref = o;
+ rl->object_ref = ob;
/* Close the second triangle. */
rt2->v[0] = &rv[1];
@@ -1376,7 +1376,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->r = &rv[0];
rl->tl = rt1;
rt1->rl[1] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
@@ -1387,7 +1387,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tl = rt1;
rl->tr = rt->rl[1]->tl == rt ? rt->rl[1]->tr : rt->rl[1]->tl;
rt1->rl[2] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
@@ -1399,7 +1399,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tr = rt2;
rt1->rl[0] = rl;
rt2->rl[0] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rt1->v[0] = rt->v[2];
rt1->v[1] = &rv[1];
@@ -1415,7 +1415,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tr = rt->rl[0]->tr == rt ? rt->rl[0]->tl : rt->rl[0]->tr;
rt2->rl[2] = rl;
rt2->rl[1] = rt->rl[2];
- rl->object_ref = o;
+ rl->object_ref = ob;
rt2->v[0] = &rv[1];
rt2->v[1] = rt->v[2];
@@ -1459,7 +1459,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->r = &rv[0];
rl->tl = rt1;
rt1->rl[1] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
@@ -1470,7 +1470,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tl = rt1;
rl->tr = rt->rl[2]->tl == rt ? rt->rl[2]->tr : rt->rl[2]->tl;
rt1->rl[2] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rl = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLine));
rls = mem_static_aquire(&rb->render_data_pool, sizeof(LineartRenderLineSegment));
@@ -1482,7 +1482,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tr = rt2;
rt1->rl[0] = rl;
rt2->rl[0] = rl;
- rl->object_ref = o;
+ rl->object_ref = ob;
rt1->v[0] = rt->v[0];
rt1->v[1] = &rv[1];
@@ -1498,7 +1498,7 @@ static void lineart_cull_triangles(LineartRenderBuffer *rb)
rl->tr = rt->rl[1]->tr == rt ? rt->rl[1]->tl : rt->rl[1]->tr;
rt2->rl[2] = rl;
rt2->rl[1] = rt->rl[0];
- rl->object_ref = o;
+ rl->object_ref = ob;
rt2->v[0] = &rv[1];
rt2->v[1] = rt->v[0];
@@ -1548,7 +1548,7 @@ static void lineart_transform_render_vert(
mul_v4_m4v3_db(rv->fbcoord, mvp_mat, co);
}
-static void lineart_make_render_geometry_buffers_object(Object *o,
+static void lineart_make_render_geometry_buffers_object(Object *ob,
double (*mv_mat)[4],
double (*mvp_mat)[4],
LineartRenderBuffer *rb,
@@ -1571,28 +1571,28 @@ static void lineart_make_render_geometry_buffers_object(Object *o,
int CanFindFreestyle = 0;
int i;
- int usage = override_usage ? override_usage : o->lineart.usage;
+ int usage = override_usage ? override_usage : ob->lineart.usage;
if (usage == OBJECT_FEATURE_LINE_EXCLUDE) {
return;
}
- if (o->type == OB_MESH) {
+ if (ob->type == OB_MESH) {
- mul_m4db_m4db_m4fl_uniq(ne
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list