[Bf-blender-cvs] [ba07ebb4cf3] soc-2019-npr: Cleanup: Make format
YimingWu
noreply at git.blender.org
Mon Jul 15 11:10:51 CEST 2019
Commit: ba07ebb4cf3d9d3b6d3614df17451b912f9ac527
Author: YimingWu
Date: Mon Jul 15 17:10:39 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBba07ebb4cf3d9d3b6d3614df17451b912f9ac527
Cleanup: Make format
===================================================================
M source/blender/blenlib/intern/math_base_inline.c
M source/blender/draw/engines/lanpr/lanpr_access.h
M source/blender/draw/engines/lanpr/lanpr_all.h
M source/blender/draw/engines/lanpr/lanpr_chain_draw.c
M source/blender/draw/engines/lanpr/lanpr_cpu.c
M source/blender/editors/include/ED_lanpr.h
M source/blender/editors/lanpr/lanpr_chain.c
M source/blender/editors/lanpr/lanpr_ops.c
M source/blender/editors/lanpr/lanpr_util.c
===================================================================
diff --git a/source/blender/blenlib/intern/math_base_inline.c b/source/blender/blenlib/intern/math_base_inline.c
index ce381fbe4a1..320f8a0f1ab 100644
--- a/source/blender/blenlib/intern/math_base_inline.c
+++ b/source/blender/blenlib/intern/math_base_inline.c
@@ -171,7 +171,7 @@ MINLINE float interpf(float target, float origin, float fac)
return (fac * target) + (1.0f - fac) * origin;
}
-MINLINE double interpd(double target, double origin, double fac)
+MINLINE double interpd(double target, double origin, double fac)
{
return (fac * target) + (1.0f - fac) * origin;
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h b/source/blender/draw/engines/lanpr/lanpr_access.h
index 1471c411f14..5f6a4c469e6 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -35,6 +35,4 @@ void ED_lanpr_free_everything(struct Scene *s);
bool ED_lanpr_dpix_shader_error();
bool ED_lanpr_disable_edge_splits(struct Scene *s);
-
-
#endif
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index facd1dfe0df..5c6ce884004 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -212,7 +212,6 @@ typedef struct LANPR_Data {
LANPR_StorageList *stl;
} LANPR_Data;
-
/* functions */
/* dpix */
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
index e1bac0a8600..191379a4c7c 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
@@ -165,4 +165,3 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb)
rb->chain_draw_batch = GPU_batch_create_ex(
GPU_PRIM_LINES_ADJ, vbo, GPU_indexbuf_build(&elb), GPU_USAGE_DYNAMIC | GPU_BATCH_OWNS_VBO);
}
-
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index c6ea127d440..eff65655178 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -514,6 +514,3 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
DRW_view_set_active(NULL);
}
}
-
-
-
diff --git a/source/blender/editors/include/ED_lanpr.h b/source/blender/editors/include/ED_lanpr.h
index 96cd144a671..50dace04327 100644
--- a/source/blender/editors/include/ED_lanpr.h
+++ b/source/blender/editors/include/ED_lanpr.h
@@ -24,7 +24,6 @@
#ifndef __ED_LANPR_H__
#define __ED_LANPR_H__
-
#include <string.h>
/* #include "lanpr_all.h" */
#include "BLI_listbase.h"
@@ -294,7 +293,6 @@ typedef struct LANPR_RenderBuffer {
} LANPR_RenderBuffer;
-
typedef struct LANPR_SharedResource {
/* We only allocate once for all */
@@ -348,7 +346,6 @@ typedef struct LANPR_SharedResource {
#define LANPR_CULL_DISCARD 2
#define LANPR_CULL_USED 1
-
#define TNS_THREAD_LINE_COUNT 10000
#define TNS_CALCULATION_IDLE 0
@@ -834,9 +831,7 @@ int ED_lanpr_max_occlusion_in_line_layers(struct SceneLANPR *lanpr);
LANPR_LineLayer *ED_lanpr_new_line_layer(struct SceneLANPR *lanpr);
LANPR_LineLayerComponent *ED_lanpr_new_line_component(struct SceneLANPR *lanpr);
-LANPR_BoundingArea* ED_lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real x, real y);
+LANPR_BoundingArea *ED_lanpr_get_point_bounding_area(LANPR_RenderBuffer *rb, real x, real y);
LANPR_BoundingArea *ED_lanpr_get_point_bounding_area_deep(LANPR_RenderBuffer *rb, real x, real y);
-
-
#endif /* __ED_LANPR_H__ */
diff --git a/source/blender/editors/lanpr/lanpr_chain.c b/source/blender/editors/lanpr/lanpr_chain.c
index 378a677aa24..07c1b61fcf1 100644
--- a/source/blender/editors/lanpr/lanpr_chain.c
+++ b/source/blender/editors/lanpr/lanpr_chain.c
@@ -268,8 +268,8 @@ void ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
if (new_rv == new_rl->l) {
for (rls = new_rl->segments.last; rls; rls = rls->prev) {
double gpos[3], lpos[3];
- interp_v3_v3v3_db( lpos,new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at);
- interp_v3_v3v3_db( gpos,new_rl->l->gloc, new_rl->r->gloc, rls->at);
+ interp_v3_v3v3_db(lpos, new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at);
+ interp_v3_v3v3_db(gpos, new_rl->l->gloc, new_rl->r->gloc, rls->at);
lanpr_push_render_line_chain_point(rb,
rlc,
lpos[0],
@@ -289,8 +289,8 @@ void ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
rls = rls->next;
for (rls; rls; rls = rls->next) {
double gpos[3], lpos[3];
- interp_v3_v3v3_db( lpos,new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at);
- interp_v3_v3v3_db( gpos,new_rl->l->gloc, new_rl->r->gloc, rls->at);
+ interp_v3_v3v3_db(lpos, new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at);
+ interp_v3_v3v3_db(gpos, new_rl->l->gloc, new_rl->r->gloc, rls->at);
lanpr_push_render_line_chain_point(rb,
rlc,
lpos[0],
@@ -322,8 +322,8 @@ void ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
last_occlusion = ((LANPR_RenderLineSegment *)rls)->occlusion;
for (rls = rls->next; rls; rls = rls->next) {
double gpos[3], lpos[3];
- interp_v3_v3v3_db( lpos,rl->l->fbcoord, rl->r->fbcoord, rls->at);
- interp_v3_v3v3_db( gpos,rl->l->gloc, rl->r->gloc, rls->at);
+ interp_v3_v3v3_db(lpos, rl->l->fbcoord, rl->r->fbcoord, rls->at);
+ interp_v3_v3v3_db(gpos, rl->l->gloc, rl->r->gloc, rls->at);
lanpr_append_render_line_chain_point(
rb, rlc, lpos[0], lpos[1], gpos[0], gpos[1], gpos[2], N, rl->flags, rls->occlusion);
last_occlusion = rls->occlusion;
@@ -358,8 +358,8 @@ void ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
rlci->occlusion = last_occlusion; /* fix leading vertex occlusion */
for (rls = new_rl->segments.last; rls; rls = rls->prev) {
double gpos[3], lpos[3];
- interp_v3_v3v3_db( lpos,new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at);
- interp_v3_v3v3_db( gpos,new_rl->l->gloc, new_rl->r->gloc, rls->at);
+ interp_v3_v3v3_db(lpos, new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at);
+ interp_v3_v3v3_db(gpos, new_rl->l->gloc, new_rl->r->gloc, rls->at);
last_occlusion = rls->prev ? rls->prev->occlusion : last_occlusion;
lanpr_append_render_line_chain_point(rb,
rlc,
@@ -380,8 +380,8 @@ void ED_lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb)
rls = rls->next;
for (rls; rls; rls = rls->next) {
double gpos[3], lpos[3];
- interp_v3_v3v3_db( lpos,new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at);
- interp_v3_v3v3_db( gpos,new_rl->l->gloc, new_rl->r->gloc, rls->at);
+ interp_v3_v3v3_db(lpos, new_rl->l->fbcoord, new_rl->r->fbcoord, rls->at);
+ interp_v3_v3v3_db(gpos, new_rl->l->gloc, new_rl->r->gloc, rls->at);
lanpr_append_render_line_chain_point(rb,
rlc,
lpos[0],
@@ -756,7 +756,6 @@ int ED_lanpr_count_chain(LANPR_RenderLineChain *rlc)
return Count;
}
-
void ED_lanpr_chain_clear_picked_flag(LANPR_RenderBuffer *rb)
{
LANPR_RenderLineChain *rlc;
diff --git a/source/blender/editors/lanpr/lanpr_ops.c b/source/blender/editors/lanpr/lanpr_ops.c
index e6f30315e78..abb0a7c5ae0 100644
--- a/source/blender/editors/lanpr/lanpr_ops.c
+++ b/source/blender/editors/lanpr/lanpr_ops.c
@@ -63,8 +63,6 @@
#include "ED_svg.h"
#include "BKE_text.h"
-
-
extern LANPR_SharedResource lanpr_share;
extern const char *RE_engine_id_BLENDER_LANPR;
struct Object;
@@ -76,36 +74,35 @@ void lanpr_rebuild_all_command(SceneLANPR *lanpr);
/* Own functions */
static LANPR_BoundingArea *lanpr_get_first_possible_bounding_area(LANPR_RenderBuffer *rb,
- LANPR_RenderLine *rl);
+ LANPR_RenderLine *rl);
static void lanpr_link_line_with_bounding_area(LANPR_RenderBuffer *rb,
- LANPR_BoundingArea *RootBoundingArea,
- LANPR_RenderLine *rl);
+ LANPR_BoundingArea *RootBoundingArea,
+ LANPR_RenderLine *rl);
static LANPR_BoundingArea *lanpr_get_next_bounding_area(LANPR_BoundingArea *This,
- LANPR_RenderLine *rl,
- real x,
- real y,
- real k,
- int PositiveX,
- int PositiveY,
- real *NextX,
- real *NextY);
+ LANPR_RenderLine *rl,
+ real x,
+ real y,
+ real k,
+ int PositiveX,
+ int PositiveY,
+ real *NextX,
+ real *NextY);
static int lanpr_triangle_line_imagespace_intersection_v2(SpinLock *spl,
- LANPR_RenderTriangle *rt,
- LANPR_RenderLine *rl,
- Object *cam,
- tnsMatrix44d vp,
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list