[Bf-blender-cvs] [563b784f2b2] soc-2019-npr: LANPR: make format
YimingWu
noreply at git.blender.org
Mon Jul 1 11:33:11 CEST 2019
Commit: 563b784f2b286c6fa88d0372773425143430362f
Author: YimingWu
Date: Mon Jul 1 17:33:00 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB563b784f2b286c6fa88d0372773425143430362f
LANPR: make format
===================================================================
M intern/cycles/util/util_logging.cpp
M source/blender/draw/engines/lanpr/lanpr_access.c
M source/blender/draw/engines/lanpr/lanpr_access.h
M source/blender/draw/engines/lanpr/lanpr_chain.c
M source/blender/draw/engines/lanpr/lanpr_ops.c
M source/blender/modifiers/intern/MOD_edgesplit.c
===================================================================
diff --git a/intern/cycles/util/util_logging.cpp b/intern/cycles/util/util_logging.cpp
index cc1e328ba6d..e41250ab1b9 100644
--- a/intern/cycles/util/util_logging.cpp
+++ b/intern/cycles/util/util_logging.cpp
@@ -29,7 +29,7 @@ CCL_NAMESPACE_BEGIN
static bool is_verbosity_set()
{
#ifdef WITH_CYCLES_LOGGING
-using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
+ using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
std::string verbosity;
if (!GetCommandLineOption("v", &verbosity)) {
@@ -37,7 +37,7 @@ using CYCLES_GFLAGS_NAMESPACE::GetCommandLineOption;
}
return verbosity != "0";
#else
- return false;
+ return false;
#endif
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.c b/source/blender/draw/engines/lanpr/lanpr_access.c
index 2bad8dcf99f..08de3ab2aa2 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.c
+++ b/source/blender/draw/engines/lanpr/lanpr_access.c
@@ -138,7 +138,8 @@ bool lanpr_dpix_shader_error()
return lanpr_share.dpix_shader_error;
}
-bool lanpr_disable_edge_splits(Scene* s){
+bool lanpr_disable_edge_splits(Scene *s)
+{
return s->lanpr.disable_edge_splits;
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_access.h b/source/blender/draw/engines/lanpr/lanpr_access.h
index b892a13ffee..16e21311040 100644
--- a/source/blender/draw/engines/lanpr/lanpr_access.h
+++ b/source/blender/draw/engines/lanpr/lanpr_access.h
@@ -32,7 +32,7 @@ void lanpr_destroy_render_data(struct LANPR_RenderBuffer *rb);
bool lanpr_dpix_shader_error();
-bool lanpr_disable_edge_splits(struct Scene* s);
+bool lanpr_disable_edge_splits(struct Scene *s);
void lanpr_copy_data(struct Scene *from, struct Scene *to);
diff --git a/source/blender/draw/engines/lanpr/lanpr_chain.c b/source/blender/draw/engines/lanpr/lanpr_chain.c
index 7f33c467a35..a69a30c6de2 100644
--- a/source/blender/draw/engines/lanpr/lanpr_chain.c
+++ b/source/blender/draw/engines/lanpr/lanpr_chain.c
@@ -724,7 +724,8 @@ void lanpr_connect_chains(LANPR_RenderBuffer *rb, int do_geometry_space)
}
/* length is in image space */
-float lanpr_compute_chain_length(LANPR_RenderLineChain *rlc){
+float lanpr_compute_chain_length(LANPR_RenderLineChain *rlc)
+{
LANPR_RenderLineChainItem *rlci;
float offset_accum = 0;
float dist;
@@ -740,12 +741,13 @@ float lanpr_compute_chain_length(LANPR_RenderLineChain *rlc){
return offset_accum;
}
-void lanpr_discard_short_chains(LANPR_RenderBuffer* rb, float threshold){
- LANPR_RenderLineChain *rlc,*next_rlc;
- for(rlc = rb->chains.first;rlc;rlc=next_rlc){
+void lanpr_discard_short_chains(LANPR_RenderBuffer *rb, float threshold)
+{
+ LANPR_RenderLineChain *rlc, *next_rlc;
+ for (rlc = rb->chains.first; rlc; rlc = next_rlc) {
next_rlc = rlc->next;
- if(lanpr_compute_chain_length(rlc)<threshold){
- BLI_remlink(&rb->chains,rlc);
+ if (lanpr_compute_chain_length(rlc) < threshold) {
+ BLI_remlink(&rb->chains, rlc);
}
}
}
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 97d52baaf50..04448ce7838 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -3641,17 +3641,17 @@ long lanpr_count_leveled_edge_segment_count(ListBase *LineList, LANPR_LineLayer
}
for (rls = rl->segments.first; rls; rls = rls->next) {
-
- if(!ll->use_multiple_levels){
+
+ if (!ll->use_multiple_levels) {
if (rls->occlusion == ll->qi_begin) {
Count++;
}
- }else{
+ }
+ else {
if (rls->occlusion >= ll->qi_begin && rls->occlusion <= ll->qi_end) {
Count++;
}
}
-
}
}
return Count;
@@ -3690,17 +3690,19 @@ void *lanpr_make_leveled_edge_vertex_array(LANPR_RenderBuffer *rb,
for (rls = rl->segments.first; rls; rls = rls->next) {
int use = 0;
- if(!ll->use_multiple_levels){
+ if (!ll->use_multiple_levels) {
if (rls->occlusion == ll->qi_begin) {
use = 1;
}
- }else{
+ }
+ else {
if (rls->occlusion >= ll->qi_begin && rls->occlusion <= ll->qi_end) {
use = 1;
}
}
- if(!use) continue;
+ if (!use)
+ continue;
if (rl->tl) {
N[0] += rl->tl->gn[0];
@@ -3897,7 +3899,7 @@ void lanpr_viewport_draw_offline_result(LANPR_TextureList *txl,
void lanpr_NO_THREAD_chain_feature_lines(LANPR_RenderBuffer *rb);
void lanpr_split_chains_for_fixed_occlusion(LANPR_RenderBuffer *rb);
void lanpr_connect_chains(LANPR_RenderBuffer *rb, int do_geometry_space);
-void lanpr_discard_short_chains(LANPR_RenderBuffer* rb, float threshold);
+void lanpr_discard_short_chains(LANPR_RenderBuffer *rb, float threshold);
void lanpr_calculate_normal_object_vector(LANPR_LineLayer *ll, float *normal_object_direction)
{
@@ -4070,7 +4072,10 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
DRW_shgroup_uniform_vec3(rb->ChainShgrp, "normal_direction", normal_object_direction, 1);
DRW_shgroup_uniform_int(rb->ChainShgrp, "occlusion_level_begin", &ll->qi_begin, 1);
- DRW_shgroup_uniform_int(rb->ChainShgrp, "occlusion_level_end", ll->use_multiple_levels?&ll->qi_end:&ll->qi_begin, 1);
+ DRW_shgroup_uniform_int(rb->ChainShgrp,
+ "occlusion_level_end",
+ ll->use_multiple_levels ? &ll->qi_end : &ll->qi_begin,
+ 1);
DRW_shgroup_uniform_vec4(
rb->ChainShgrp, "preview_viewport", stl->g_data->dpix_viewport, 1);
@@ -4251,12 +4256,12 @@ static int lanpr_compute_feature_lines_exec(struct bContext *C, struct wmOperato
return OPERATOR_FINISHED;
}
- WM_event_add_notifier(C, NC_OBJECT | ND_DRAW , NULL);
+ WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
result = lanpr_compute_feature_lines_internal(CTX_data_depsgraph(C));
-
+
lanpr_rebuild_all_command(lanpr);
-
+
return result;
}
static void lanpr_compute_feature_lines_cancel(struct bContext *C, struct wmOperator *op)
@@ -4320,7 +4325,7 @@ int lanpr_add_line_layer_exec(struct bContext *C, struct wmOperator *op)
DEG_id_tag_update(&scene->id, ID_RECALC_COPY_ON_WRITE);
- WM_event_add_notifier(C, NC_OBJECT | ND_DRAW , NULL);
+ WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
return OPERATOR_FINISHED;
}
@@ -4353,7 +4358,7 @@ int lanpr_delete_line_layer_exec(struct bContext *C, struct wmOperator *op)
DEG_id_tag_update(&scene->id, ID_RECALC_COPY_ON_WRITE);
- WM_event_add_notifier(C, NC_OBJECT | ND_DRAW , NULL);
+ WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
return OPERATOR_FINISHED;
}
@@ -4381,7 +4386,7 @@ int lanpr_move_line_layer_exec(struct bContext *C, struct wmOperator *op)
DEG_id_tag_update(&scene->id, ID_RECALC_COPY_ON_WRITE);
- WM_event_add_notifier(C, NC_OBJECT | ND_DRAW , NULL);
+ WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
return OPERATOR_FINISHED;
}
@@ -4431,7 +4436,7 @@ int lanpr_rebuild_all_commands_exec(struct bContext *C, struct wmOperator *op)
DEG_id_tag_update(&scene->id, ID_RECALC_COPY_ON_WRITE);
- WM_event_add_notifier(C, NC_OBJECT | ND_DRAW , NULL);
+ WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, NULL);
return OPERATOR_FINISHED;
}
@@ -4542,7 +4547,8 @@ void lanpr_update_gp_strokes_recursive(Depsgraph *dg, struct Collection *col, in
flmd->material,
NULL,
flmd->types);
- DEG_id_tag_update(&gpd->id, ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
+ DEG_id_tag_update(&gpd->id,
+ ID_RECALC_TRANSFORM | ID_RECALC_GEOMETRY | ID_RECALC_COPY_ON_WRITE);
}
}
}
@@ -4606,7 +4612,7 @@ int lanpr_update_gp_strokes_exec(struct bContext *C, struct wmOperator *op)
lanpr_update_gp_strokes_collection(dg, scene->master_collection, frame);
- WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED | ND_SPACE_PROPERTIES, NULL);
+ WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED | ND_SPACE_PROPERTIES, NULL);
return OPERATOR_FINISHED;
}
@@ -4632,7 +4638,7 @@ int lanpr_bake_gp_strokes_exec(struct bContext *C, struct wmOperator *op)
lanpr_update_gp_strokes_collection(dg, scene->master_collection, frame);
}
- WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED | ND_SPACE_PROPERTIES, NULL);
+ WM_event_add_notifier(C, NC_GPENCIL | ND_DATA | NA_EDITED | ND_SPACE_PROPERTIES, NULL);
return OPERATOR_FINISHED;
}
diff --git a/source/blender/modifiers/intern/MOD_edgesplit.c b/source/blender/modifiers/intern/MOD_edgesplit.c
index d7509727972..d9fdbda76bb 100644
--- a/source/blender/modifiers/intern/MOD_edgesplit.c
+++ b/source/blender/modifiers/intern/MOD_edgesplit.c
@@ -129,34 +129,36 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *UNUSED(c
return result;
}
-static bool isDisabled(const struct Scene *scene, struct ModifierData *md, bool userRenderParams){
- int lanpr_found=0;
- ModifierData* imd;
+static bool isDisabled(const struct Scene *scene, struct ModifierData *md, bool userRenderParams)
+{
+ int lanpr_found = 0;
+ ModifierData *imd;
EdgeSplitModifierData *emd = (EdgeSplitModifierData *)md;
- if(lanpr_disable_edge_splits(scene)){
+ if (lanpr_disable_edge_splits(scene)) {
lanpr_found = 1;
}
- if(!lanpr_found){
- for(imd = md->prev; imd; imd=imd->prev){
- if(imd->type == eModifierType_FeatureLine){
+ if (!lanpr_found) {
+ for (imd = md->prev; imd; imd = imd->prev) {
+ if (imd->type == eModifierType_FeatureLine) {
lanpr_found = 1;
break;
}
}
}
- if(!lanpr_found){
- for(imd = md->next; imd; imd=imd->next){
- if(imd->type == eModifierType_FeatureLine){
+ if (!lanpr_found) {
+ for (imd = md->next; imd; imd = imd->next) {
+ if (imd->type == eModifierType_FeatureLine) {
lanpr_found = 1;
break;
}
}
}
- if(!lanpr_found){
+ if (!lanpr_found) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list