[Bf-blender-cvs] [9ec72374c3f] temp-lanpr-staging: Cleanup: make format.

YimingWu noreply at git.blender.org
Fri Aug 16 05:12:47 CEST 2019


Commit: 9ec72374c3f16d2d695af96cd7de80b3909f201d
Author: YimingWu
Date:   Fri Aug 16 11:12:28 2019 +0800
Branches: temp-lanpr-staging
https://developer.blender.org/rB9ec72374c3f16d2d695af96cd7de80b3909f201d

Cleanup: make format.

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

M	source/blender/blenkernel/intern/scene.c
M	source/blender/blenlib/intern/math_matrix.c
M	source/blender/draw/engines/lanpr/lanpr_cpu.c
M	source/blender/editors/include/ED_lanpr.h
M	source/blender/editors/lanpr/lanpr_cpu.c
M	source/blender/editors/lanpr/lanpr_util.c
M	source/blender/editors/space_buttons/buttons_context.c
M	source/blender/makesdna/DNA_scene_types.h

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index d73843663fd..8d087c05977 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -1017,7 +1017,7 @@ void BKE_scene_init(Scene *sce)
   /* SceneLANPR */
 
   sce->lanpr.crease_threshold = 0.7;
-  
+
   sce->lanpr.enable_intersections = 1;
 
   sce->lanpr.line_color[0] = 1;
diff --git a/source/blender/blenlib/intern/math_matrix.c b/source/blender/blenlib/intern/math_matrix.c
index 48e9f905f18..ffd04e5aa29 100644
--- a/source/blender/blenlib/intern/math_matrix.c
+++ b/source/blender/blenlib/intern/math_matrix.c
@@ -141,7 +141,6 @@ void copy_m4_m3(float m1[4][4], const float m2[3][3]) /* no clear */
   m1[3][3] = 1.0f;
 }
 
-
 void copy_m4d_m4(double m1[4][4], const float m2[4][4])
 {
   m1[0][0] = m2[0][0];
@@ -269,7 +268,6 @@ void mul_m4_m4m4_uniq(float R[4][4], const float A[4][4], const float B[4][4])
 #endif
 }
 
-
 void mul_m4db_m4db_m4fl_uniq(double R[4][4], const double A[4][4], const float B[4][4])
 {
   BLI_assert(R != A && R != B);
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 423ad643d9a..1088b082d90 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -94,8 +94,8 @@ static void lanpr_rebuild_render_draw_command(LANPR_RenderBuffer *rb, LANPR_Line
 
     GPU_vertbuf_data_alloc(vbo, vertCount);
 
-    tv = v = MEM_callocN(sizeof(float)*6*Count, "temp v data");
-    tn = N = MEM_callocN(sizeof(float)*6*Count, "temp n data");
+    tv = v = MEM_callocN(sizeof(float) * 6 * Count, "temp v data");
+    tn = N = MEM_callocN(sizeof(float) * 6 * Count, "temp n data");
 
     if (ll->contour.enabled) {
       tv = lanpr_make_leveled_edge_vertex_array(rb, &rb->contours, tv, tn, &tn, ll, 1.0f);
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index f9d10bd7b9e..129c4166233 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -454,7 +454,6 @@ typedef struct LANPR_BoundingArea {
 #define TNS_IN_TILE(RenderTile, Fx, Fy) \
   (TNS_IN_TILE_X(RenderTile, Fx) && TNS_IN_TILE_Y(RenderTile, Fy))
 
-
 BLI_INLINE int lanpr_TrangleLineBoundBoxTest(LANPR_RenderTriangle *rt, LANPR_RenderLine *rl)
 {
   if (MAX3(rt->v[0]->fbcoord[2], rt->v[1]->fbcoord[2], rt->v[2]->fbcoord[2]) >
@@ -567,7 +566,6 @@ void *mem_static_aquire(LANPR_StaticMemPool *smp, int size);
 void *mem_static_aquire_thread(LANPR_StaticMemPool *smp, int size);
 void *mem_static_destroy(LANPR_StaticMemPool *smp);
 
-
 void tmat_make_ortho_matrix_44d(
     double (*mProjection)[4], real xMin, real xMax, real yMin, real yMax, real zMin, real zMax);
 void tmat_make_perspective_matrix_44d(
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index b97f8aef36b..5fb44d23562 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -523,7 +523,7 @@ static void lanpr_cut_render_line(LANPR_RenderBuffer *rb,
   if (begin_segment) {
     if (begin_segment != ns) {
       ns->occlusion = begin_segment->prev ? (irls = begin_segment->prev)->occlusion : 0;
-      BLI_insertlinkbefore(&rl->segments,(void *)begin_segment,(void *)ns);
+      BLI_insertlinkbefore(&rl->segments, (void *)begin_segment, (void *)ns);
     }
   }
   else {
@@ -533,7 +533,7 @@ static void lanpr_cut_render_line(LANPR_RenderBuffer *rb,
   if (end_segment) {
     if (end_segment != ns2) {
       ns2->occlusion = end_segment->prev ? (irls = end_segment->prev)->occlusion : 0;
-      BLI_insertlinkbefore(&rl->segments,(void *)end_segment,(void *)ns2);
+      BLI_insertlinkbefore(&rl->segments, (void *)end_segment, (void *)ns2);
     }
   }
   else {
@@ -871,7 +871,7 @@ static int lanpr_point_inside_triangle3de(tnsVector3d v,
   /*  tmat_normalize_self_3d(r); */
   cross_v3_v3v3_db(N2, l, r);
 
-  if ((d = dot_v3v3_db(N1,  N2)) < 0) {
+  if ((d = dot_v3v3_db(N1, N2)) < 0) {
     return 0;
   }
   /*  if (d<DBL_EPSILON) return -1; */
@@ -882,7 +882,7 @@ static int lanpr_point_inside_triangle3de(tnsVector3d v,
   /*  tmat_normalize_self_3d(r); */
   cross_v3_v3v3_db(N1, l, r);
 
-  if ((d = dot_v3v3_db(N1,  N2)) < 0) {
+  if ((d = dot_v3v3_db(N1, N2)) < 0) {
     return 0;
   }
   /*  if (d<DBL_EPSILON) return -1; */
@@ -893,7 +893,7 @@ static int lanpr_point_inside_triangle3de(tnsVector3d v,
   /*  tmat_normalize_self_3d(r); */
   cross_v3_v3v3_db(N2, l, r);
 
-  if ((d = dot_v3v3_db(N1,  N2)) < 0) {
+  if ((d = dot_v3v3_db(N1, N2)) < 0) {
     return 0;
   }
   /*  if (d<DBL_EPSILON) return -1; */
@@ -1065,16 +1065,16 @@ static void lanpr_cull_triangles(LANPR_RenderBuffer *rb)
           if (!In1) {
             sub_v3_v3v3_db(vv1, rt->v[0]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[2]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot1 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[0].gloc, rt->v[0]->gloc, rt->v[2]->gloc, a);
             mul_v4_m4v3_db(rv[0].fbcoord, vp, rv[0].gloc);
 
             sub_v3_v3v3_db(vv1, rt->v[0]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[1]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot1 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[1].gloc, rt->v[0]->gloc, rt->v[1]->gloc, a);
             mul_v4_m4v3_db(rv[1].fbcoord, vp, rv[1].gloc);
@@ -1131,16 +1131,16 @@ static void lanpr_cull_triangles(LANPR_RenderBuffer *rb)
           else if (!In3) {
             sub_v3_v3v3_db(vv1, rt->v[2]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[0]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot1 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[0].gloc, rt->v[2]->gloc, rt->v[0]->gloc, a);
             mul_v4_m4v3_db(rv[0].fbcoord, vp, rv[0].gloc);
 
             sub_v3_v3v3_db(vv1, rt->v[2]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[1]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot1 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[1].gloc, rt->v[2]->gloc, rt->v[1]->gloc, a);
             mul_v4_m4v3_db(rv[1].fbcoord, vp, rv[1].gloc);
@@ -1197,16 +1197,16 @@ static void lanpr_cull_triangles(LANPR_RenderBuffer *rb)
           else if (!In2) {
             sub_v3_v3v3_db(vv1, rt->v[1]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[2]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot1 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[0].gloc, rt->v[1]->gloc, rt->v[2]->gloc, a);
             mul_v4_m4v3_db(rv[0].fbcoord, vp, rv[0].gloc);
 
             sub_v3_v3v3_db(vv1, rt->v[1]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[0]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot1 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[1].gloc, rt->v[1]->gloc, rt->v[0]->gloc, a);
             mul_v4_m4v3_db(rv[1].fbcoord, vp, rv[1].gloc);
@@ -1266,16 +1266,16 @@ static void lanpr_cull_triangles(LANPR_RenderBuffer *rb)
           if (In1) {
             sub_v3_v3v3_db(vv1, rt->v[1]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[0]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot2 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[0].gloc, rt->v[0]->gloc, rt->v[1]->gloc, a);
             mul_v4_m4v3_db(rv[0].fbcoord, vp, rv[0].gloc);
 
             sub_v3_v3v3_db(vv1, rt->v[2]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[0]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot2 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[1].gloc, rt->v[0]->gloc, rt->v[2]->gloc, a);
             mul_v4_m4v3_db(rv[1].fbcoord, vp, rv[1].gloc);
@@ -1349,16 +1349,16 @@ static void lanpr_cull_triangles(LANPR_RenderBuffer *rb)
 
             sub_v3_v3v3_db(vv1, rt->v[1]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[2]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot1 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[0].gloc, rt->v[1]->gloc, rt->v[2]->gloc, a);
             mul_v4_m4v3_db(rv[0].fbcoord, vp, rv[0].gloc);
 
             sub_v3_v3v3_db(vv1, rt->v[1]->gloc, cam_pos);
             sub_v3_v3v3_db(vv2, cam_pos, rt->v[0]->gloc);
-            dot1 = dot_v3v3_db(vv1,  view_dir);
-            dot2 = dot_v3v3_db(vv2,  view_dir);
+            dot1 = dot_v3v3_db(vv1, view_dir);
+            dot2 = dot_v3v3_db(vv2, view_dir);
             a = dot1 / (dot1 + dot2);
             interp_v3_v3v3_db(rv[1].gloc, rt->v[1]->gloc, rt->v[0]->gloc, a);
             mul_v4_m4v3_db(rv[1].fbcoord, vp, rv[1].gloc);
@@ -1432,16 +1432,16 @@ static void lanpr_cull_triangles(LANPR_RenderBuffer *r

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list