[Bf-blender-cvs] [c57c4e6d47a] soc-2019-npr: Cleanup: Make format.
YimingWu
noreply at git.blender.org
Mon Aug 5 10:38:17 CEST 2019
Commit: c57c4e6d47a627cd5b63fd2b493440f99cb6d042
Author: YimingWu
Date: Mon Aug 5 16:38:04 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBc57c4e6d47a627cd5b63fd2b493440f99cb6d042
Cleanup: Make format.
===================================================================
M source/blender/draw/engines/lanpr/lanpr_cpu.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/editors/lanpr/lanpr_cpu.c
M source/blender/makesdna/DNA_lanpr_types.h
M source/blender/makesrna/intern/rna_lanpr.c
===================================================================
diff --git a/source/blender/draw/engines/lanpr/lanpr_cpu.c b/source/blender/draw/engines/lanpr/lanpr_cpu.c
index be4f1668044..c8de406ab62 100644
--- a/source/blender/draw/engines/lanpr/lanpr_cpu.c
+++ b/source/blender/draw/engines/lanpr/lanpr_cpu.c
@@ -161,7 +161,7 @@ void ED_lanpr_rebuild_all_command(SceneLANPR *lanpr)
void ED_lanpr_calculate_normal_object_vector(LANPR_LineLayer *ll, float *normal_object_direction)
{
Object *ob;
- if(!ll->normal_enabled){
+ if (!ll->normal_enabled) {
return;
}
switch (ll->normal_mode) {
@@ -329,7 +329,8 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
DRW_shgroup_uniform_int(
rb->ChainShgrp, "enable_intersection", &ll->intersection.enabled, 1);
- DRW_shgroup_uniform_int(rb->ChainShgrp, "normal_mode", ll->normal_enabled?&ll->normal_mode:&zero_value, 1);
+ DRW_shgroup_uniform_int(
+ rb->ChainShgrp, "normal_mode", ll->normal_enabled ? &ll->normal_mode : &zero_value, 1);
DRW_shgroup_uniform_int(
rb->ChainShgrp, "normal_effect_inverse", &ll->normal_effect_inverse, 1);
DRW_shgroup_uniform_float(rb->ChainShgrp, "normal_ramp_begin", &ll->normal_ramp_begin, 1);
@@ -429,7 +430,8 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
DRW_shgroup_uniform_vec4(ll->shgrp, "preview_viewport", stl->g_data->dpix_viewport, 1);
DRW_shgroup_uniform_vec4(ll->shgrp, "output_viewport", stl->g_data->output_viewport, 1);
- DRW_shgroup_uniform_int(ll->shgrp, "normal_mode", ll->normal_enabled?&ll->normal_mode:&zero_value, 1);
+ DRW_shgroup_uniform_int(
+ ll->shgrp, "normal_mode", ll->normal_enabled ? &ll->normal_mode : &zero_value, 1);
DRW_shgroup_uniform_int(
ll->shgrp, "normal_effect_inverse", &ll->normal_effect_inverse, 1);
DRW_shgroup_uniform_float(ll->shgrp, "normal_ramp_begin", &ll->normal_ramp_begin, 1);
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 95df026f91a..b57ab31e2cb 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -738,18 +738,17 @@ DrawEngineType draw_engine_lanpr_type = {
&lanpr_render_to_image,
};
-RenderEngineType DRW_engine_viewport_lanpr_type = {
- NULL,
- NULL,
- LANPR_ENGINE,
- N_("LANPR"),
- RE_INTERNAL,
- NULL, /* update */
- &DRW_render_to_image, /* render to img */
- NULL, /* bake */
- NULL, /* view update */
- NULL, /* render to view */
- NULL, /* update in script */
- NULL, /* update in render pass */
- &draw_engine_lanpr_type,
- {NULL, NULL, NULL}};
+RenderEngineType DRW_engine_viewport_lanpr_type = {NULL,
+ NULL,
+ LANPR_ENGINE,
+ N_("LANPR"),
+ RE_INTERNAL,
+ NULL, /* update */
+ &DRW_render_to_image, /* render to img */
+ NULL, /* bake */
+ NULL, /* view update */
+ NULL, /* render to view */
+ NULL, /* update in script */
+ NULL, /* update in render pass */
+ &draw_engine_lanpr_type,
+ {NULL, NULL, NULL}};
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index 18e910736ce..f2cc0be616e 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -3063,7 +3063,7 @@ static void lanpr_split_bounding_area(LANPR_RenderBuffer *rb, LANPR_BoundingArea
LANPR_BoundingArea *ba = mem_static_aquire(&rb->render_data_pool,
sizeof(LANPR_BoundingArea) * 4);
LANPR_RenderTriangle *rt;
- LANPR_RenderLine* rl;
+ LANPR_RenderLine *rl;
ba[0].l = Root->cx;
ba[0].r = Root->r;
@@ -3119,7 +3119,7 @@ static void lanpr_split_bounding_area(LANPR_RenderBuffer *rb, LANPR_BoundingArea
}
while ((rl = list_pop_pointer_no_free(&Root->linked_lines)) != NULL) {
- lanpr_link_line_with_bounding_area(rb,Root,rl);
+ lanpr_link_line_with_bounding_area(rb, Root, rl);
}
rb->bounding_area_count += 3;
diff --git a/source/blender/makesdna/DNA_lanpr_types.h b/source/blender/makesdna/DNA_lanpr_types.h
index 1add9bd61d7..d5c14c18eeb 100644
--- a/source/blender/makesdna/DNA_lanpr_types.h
+++ b/source/blender/makesdna/DNA_lanpr_types.h
@@ -99,7 +99,7 @@ typedef struct LANPR_LineLayer {
int qi_end;
/** To be displayed on the list */
- char name[64];
+ char name[64];
LANPR_LineType contour;
LANPR_LineType crease;
@@ -113,7 +113,7 @@ typedef struct LANPR_LineLayer {
int use_same_style;
- int _pad1;
+ int _pad1;
char _pad2;
char normal_enabled;
@@ -126,7 +126,7 @@ typedef struct LANPR_LineLayer {
struct Object *normal_control_object;
/** For component evaluation */
- int logic_mode;
+ int logic_mode;
int _pad3;
ListBase components;
diff --git a/source/blender/makesrna/intern/rna_lanpr.c b/source/blender/makesrna/intern/rna_lanpr.c
index 69a005692b7..661d29419a5 100644
--- a/source/blender/makesrna/intern/rna_lanpr.c
+++ b/source/blender/makesrna/intern/rna_lanpr.c
@@ -122,11 +122,11 @@ void RNA_def_lanpr(BlenderRNA *brna)
prop = RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
RNA_def_property_ui_text(prop, "Name", "Name of this layer");
- prop = RNA_def_property(srna,"normal_enabled",PROP_BOOLEAN,PROP_NONE);
+ prop = RNA_def_property(srna, "normal_enabled", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_ui_text(prop, "Enabled", "Enable normal controlled line weight");
prop = RNA_def_property(srna, "normal_mode", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_items(prop, rna_enum_lanpr_normal_mode);\
+ RNA_def_property_enum_items(prop, rna_enum_lanpr_normal_mode);
RNA_def_property_ui_text(prop, "Normal", "Normal controlled line weight");
prop = RNA_def_property(srna, "normal_effect_inverse", PROP_BOOLEAN, PROP_NONE);
More information about the Bf-blender-cvs
mailing list