[Bf-blender-cvs] [4ddc14c7325] soc-2019-npr: Cleanup: make format.
YimingWu
noreply at git.blender.org
Mon Aug 5 02:48:36 CEST 2019
Commit: 4ddc14c7325f3c229720e1d99049733349fe841b
Author: YimingWu
Date: Mon Aug 5 08:48:21 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB4ddc14c7325f3c229720e1d99049733349fe841b
Cleanup: make format.
===================================================================
M source/blender/blenkernel/intern/scene.c
M source/blender/blentranslation/msgfmt/msgfmt.c
M source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
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/draw/engines/lanpr/lanpr_engine.c
M source/blender/draw/intern/draw_cache_impl_mesh.c
M source/blender/editors/include/ED_lanpr.h
M source/blender/editors/lanpr/lanpr_chain.c
M source/blender/editors/lanpr/lanpr_cpu.c
M source/blender/editors/lanpr/lanpr_util.c
M source/blender/editors/mesh/editmesh_path.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/makesdna/DNA_lanpr_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 435ee6d917d..b8e2e6b2f88 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -234,13 +234,13 @@ void BKE_lanpr_copy_data(const Scene *from, Scene *to)
LANPR_LineLayer *ll, *new_ll;
LANPR_LineLayerComponent *llc, *new_llc;
- to->lanpr.line_layers.first = to->lanpr.line_layers.last=NULL;
- memset(&to->lanpr.line_layers,0,sizeof(ListBase));
+ to->lanpr.line_layers.first = to->lanpr.line_layers.last = NULL;
+ memset(&to->lanpr.line_layers, 0, sizeof(ListBase));
for (ll = lanpr->line_layers.first; ll; ll = ll->next) {
new_ll = MEM_callocN(sizeof(LANPR_LineLayer), "Copied Line Layer");
memcpy(new_ll, ll, sizeof(LANPR_LineLayer));
- memset(&new_ll->components,0,sizeof(ListBase));
+ memset(&new_ll->components, 0, sizeof(ListBase));
new_ll->next = new_ll->prev = NULL;
BLI_addtail(&to->lanpr.line_layers, new_ll);
for (llc = ll->components.first; llc; llc = llc->next) {
@@ -365,7 +365,7 @@ void BKE_scene_copy_data(Main *bmain, Scene *sce_dst, const Scene *sce_src, cons
/* lanpr data */
- BKE_lanpr_copy_data(sce_src, sce_dst);
+ BKE_lanpr_copy_data(sce_src, sce_dst);
}
Scene *BKE_scene_copy(Main *bmain, Scene *sce, int type)
@@ -508,8 +508,8 @@ void BKE_lanpr_free_everything(Scene *s)
LANPR_LineLayer *ll;
LANPR_LineLayerComponent *llc;
- while ((ll = BLI_pophead(&lanpr->line_layers))!=NULL) {
- while ((llc = BLI_pophead(&ll->components))!=NULL){
+ while ((ll = BLI_pophead(&lanpr->line_layers)) != NULL) {
+ while ((llc = BLI_pophead(&ll->components)) != NULL) {
MEM_freeN(llc);
}
MEM_freeN(ll);
diff --git a/source/blender/blentranslation/msgfmt/msgfmt.c b/source/blender/blentranslation/msgfmt/msgfmt.c
index 86d55e203d9..215c92f87de 100644
--- a/source/blender/blentranslation/msgfmt/msgfmt.c
+++ b/source/blender/blentranslation/msgfmt/msgfmt.c
@@ -82,12 +82,12 @@ static char *trim(char *str)
return str;
}
- for (i = 0; i < len && ELEM(str[0], ' ', '\t', '\r','\n'); str++, i++) {
+ for (i = 0; i < len && ELEM(str[0], ' ', '\t', '\r', '\n'); str++, i++) {
/* pass */
}
char *end = &str[len - 1 - i];
- for (i = len; i > 0 && ELEM(end[0], ' ', '\t', '\r','\n'); end--, i--) {
+ for (i = len; i > 0 && ELEM(end[0], ' ', '\t', '\r', '\n'); end--, i--) {
/* pass */
}
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
index 8281a696b35..96d4b3eca34 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_stroke_frag.glsl
@@ -76,11 +76,11 @@ void main()
}
/* gradient */
- if (gradient_f < 1.0) {
+ if (gradient_f < 1.0) {
float dist = abs(mTexCoord.y - 0.5) * 2.0;
float decay = dist * (1.0 - gradient_f) * fragColor.a;
fragColor.a = clamp(fragColor.a - decay, 0.0, 1.0);
- }
+ }
if (fragColor.a < 0.0035) {
discard;
diff --git a/source/blender/draw/engines/lanpr/lanpr_all.h b/source/blender/draw/engines/lanpr/lanpr_all.h
index ff0b7ec25d0..1ff1b844e7a 100644
--- a/source/blender/draw/engines/lanpr/lanpr_all.h
+++ b/source/blender/draw/engines/lanpr/lanpr_all.h
@@ -111,7 +111,7 @@ typedef struct LANPR_TextureList {
struct GPUTexture *depth;
struct GPUTexture *edge_intermediate;
- struct GPUTexture *dpix_in_pl;
+ struct GPUTexture *dpix_in_pl;
struct GPUTexture *dpix_in_pr;
struct GPUTexture *dpix_in_nl;
struct GPUTexture *dpix_in_nr;
@@ -119,7 +119,7 @@ typedef struct LANPR_TextureList {
/** RGBA texture format,
* R:Material, G: Freestyle Edge Mark,
* BA:Reserved for future usages */
- struct GPUTexture *dpix_in_edge_mask;
+ struct GPUTexture *dpix_in_edge_mask;
struct GPUTexture *dpix_out_pl;
struct GPUTexture *dpix_out_pr;
@@ -153,13 +153,13 @@ typedef struct LANPR_PrivateData {
float znear;
/** Thinning stage */
- int stage;
+ int stage;
float *line_result;
unsigned char *line_result_8bit;
-
+
/** If not match then recreate buffer. */
- int width, height;
+ int width, height;
void **sample_table;
ListBase pending_samples;
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
index e0f6876a790..4c6ed6d9c3f 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c
@@ -26,7 +26,9 @@
#include <math.h>
-static float ED_lanpr_compute_chain_length_draw(LANPR_RenderLineChain *rlc, float *lengths, int begin_index)
+static float ED_lanpr_compute_chain_length_draw(LANPR_RenderLineChain *rlc,
+ float *lengths,
+ int begin_index)
{
LANPR_RenderLineChainItem *rlci;
int i = 0;
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index 3d252e4e56a..6d2d49eac15 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -307,7 +307,8 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
1);
DRW_shgroup_uniform_float(rb->ChainShgrp,
"thickness_material",
- ll->use_same_style ? &unit_thickness : &ll->material_separate.thickness,
+ ll->use_same_style ? &unit_thickness :
+ &ll->material_separate.thickness,
1);
DRW_shgroup_uniform_float(rb->ChainShgrp,
"thickness_edge_mark",
@@ -384,8 +385,10 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
ll->shgrp, "contour_color", ll->use_same_style ? ll->color : ll->contour.color, 1);
DRW_shgroup_uniform_vec4(
ll->shgrp, "crease_color", ll->use_same_style ? ll->color : ll->crease.color, 1);
- DRW_shgroup_uniform_vec4(
- ll->shgrp, "material_color", ll->use_same_style ? ll->color : ll->material_separate.color, 1);
+ DRW_shgroup_uniform_vec4(ll->shgrp,
+ "material_color",
+ ll->use_same_style ? ll->color : ll->material_separate.color,
+ 1);
DRW_shgroup_uniform_vec4(ll->shgrp,
"edge_mark_color",
ll->use_same_style ? ll->color : ll->edge_mark.color,
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index cc10c060694..75136e929f4 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -94,9 +94,9 @@ static void lanpr_engine_init(void *ved)
GPU_ATTACHMENT_TEXTURE(txl->color),
GPU_ATTACHMENT_TEXTURE(txl->normal)});
- GPU_framebuffer_ensure_config(&fbl->edge_intermediate,
- {GPU_ATTACHMENT_TEXTURE(txl->depth),
- GPU_ATTACHMENT_TEXTURE(txl->edge_intermediate)});
+ GPU_framebuffer_ensure_config(
+ &fbl->edge_intermediate,
+ {GPU_ATTACHMENT_TEXTURE(txl->depth), GPU_ATTACHMENT_TEXTURE(txl->edge_intermediate)});
if (!lanpr_share.multichannel_shader) {
lanpr_share.multichannel_shader = DRW_shader_create(
@@ -345,7 +345,8 @@ static void lanpr_cache_init(void *vedata)
1);
DRW_shgroup_uniform_float(stl->g_data->dpix_preview_shgrp,
"line_thickness_material",
- ll->use_same_style ? &unit_thickness : &ll->material_separate.thickness,
+ ll->use_same_style ? &unit_thickness :
+ &ll->material_separate.thickness,
1);
DRW_shgroup_uniform_float(stl->g_data->dpix_preview_shgrp,
"line_thickness_edge_mark",
@@ -387,7 +388,7 @@ static void lanpr_cache_init(void *vedata)
pd->atlas_edge_mask = MEM_callocN(fsize, "atlas_edge_mask"); /* should always be float */
LANPR_BatchItem *dpbi;
- while ((dpbi = BLI_pophead(&lanpr_share.dpix_batch_list))!=NULL) {
+ while ((dpbi = BLI_pophead(&lanpr_share.dpix_batch_list)) != NULL) {
GPU_BATCH_DISCARD_SAFE(dpbi->dpix_preview_batch);
GPU_BATCH_DISCARD_SAFE(dpbi->dpix_transform_batch);
}
@@ -434,9 +435,9 @@ static void lanpr_cache_populate(void *vedata, Object *ob)
LANPR_StorageList *stl = ((LANPR_Data *)vedata)->stl;
LANPR_PrivateData *pd = stl->g_data;
- const DRWContextState *draw_ctx = DRW_context_state_get();\
+ const DRWContextState *draw_ctx = DRW_context_state_get();
SceneLANPR *lanpr = &draw_ctx->scene->lanpr;
- int usage = OBJECT_FEATURE_LINE_INHERENT, dpix_ok=0;
+ int usage = OBJECT_FEATURE_LINE_INHERENT, dpix_ok = 0;
if (!DRW_object_is_renderable(ob)) {
return;
@@ -451,7 +452,7 @@ static void lanpr_cache_populate(void *vedata, Object *ob)
struct GPUBatch *geom = DRW_cache_object_surface_get(ob);
if (geom) {
if ((dpix_ok = (lanpr->master_mode == LANPR_MASTER_MODE_DPIX && lanpr->active_layer &&
- !lanpr_share.dpix_shader_error))!=0) {
+ !lanpr_share.dpix_shader_error)) != 0) {
usage = ED_lanpr_object_collection_usage_check(draw_ctx->scene->master_collection, ob);
if (usage == OBJECT_FEATURE_LINE_EXCLUDE) {
return;
@@ -581,9 +582,9 @@ static void lanpr_draw_scene(void *vedata)
}
static void lanpr_render_cache(void *vedata,
- struct Object *ob,
- struct RenderEngine *UNUSED(engine),
- struct Depsgraph
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list