Commit: b120ee633e2f7f33dccef4288109261d8a9b54f2 Author: YimingWu Date: Fri Aug 9 09:39:15 2019 +0800 Branches: soc-2019-npr https://developer.blender.org/rBb120ee633e2f7f33dccef4288109261d8a9b54f2
Cleanup: make format. =================================================================== M source/blender/draw/engines/lanpr/lanpr_chain_draw.c M source/blender/draw/engines/lanpr/lanpr_engine.c M source/blender/makesrna/intern/rna_lanpr.c =================================================================== diff --git a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c index ceb17e4d864..e16cb289c8c 100644 --- a/source/blender/draw/engines/lanpr/lanpr_chain_draw.c +++ b/source/blender/draw/engines/lanpr/lanpr_chain_draw.c @@ -162,6 +162,9 @@ void lanpr_chain_generate_draw_command(LANPR_RenderBuffer *rb) if (rb->chain_draw_batch) { GPU_BATCH_DISCARD_SAFE(rb->chain_draw_batch); } - rb->chain_draw_batch = GPU_batch_create_ex( - GPU_PRIM_LINES_ADJ, vbo, GPU_indexbuf_build(&elb), GPU_USAGE_DYNAMIC | GPU_BATCH_OWNS_VBO | GPU_BATCH_OWNS_INDEX); + rb->chain_draw_batch = GPU_batch_create_ex(GPU_PRIM_LINES_ADJ, + vbo, + GPU_indexbuf_build(&elb), + GPU_USAGE_DYNAMIC | GPU_BATCH_OWNS_VBO | + GPU_BATCH_OWNS_INDEX); } diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c index 04bf6a5986e..b8b3ba44303 100644 --- a/source/blender/draw/engines/lanpr/lanpr_engine.c +++ b/source/blender/draw/engines/lanpr/lanpr_engine.c @@ -132,21 +132,22 @@ static void lanpr_engine_init(void *ved) lanpr_share.init_complete = 1; } -static void lanpr_dpix_batch_free(void){ +static void lanpr_dpix_batch_free(void) +{ LANPR_BatchItem *dpbi; - 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); + 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); + } + LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared; + if (rb) { + if (rb->DPIXIntersectionBatch) { + GPU_BATCH_DISCARD_SAFE(rb->DPIXIntersectionBatch); } - LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared; - if (rb) { - if (rb->DPIXIntersectionBatch) { - GPU_BATCH_DISCARD_SAFE(rb->DPIXIntersectionBatch); - } - if (rb->DPIXIntersectionTransformBatch) { - GPU_BATCH_DISCARD_SAFE(rb->DPIXIntersectionTransformBatch); - } + if (rb->DPIXIntersectionTransformBatch) { + GPU_BATCH_DISCARD_SAFE(rb->DPIXIntersectionTransformBatch); } + } } static void lanpr_engine_free(void) @@ -163,9 +164,9 @@ static void lanpr_engine_free(void) lanpr_dpix_batch_free(); if (lanpr_share.render_buffer_shared) { - LANPR_RenderBuffer* rb = lanpr_share.render_buffer_shared; + LANPR_RenderBuffer *rb = lanpr_share.render_buffer_shared; ED_lanpr_destroy_render_data(rb); - + GPU_BATCH_DISCARD_SAFE(rb->chain_draw_batch); MEM_freeN(rb); @@ -408,7 +409,7 @@ static void lanpr_cache_init(void *vedata) pd->atlas_nl = MEM_callocN(fsize, "atlas_normal_l"); pd->atlas_nr = MEM_callocN(fsize, "atlas_normal_l"); pd->atlas_edge_mask = MEM_callocN(fsize, "atlas_edge_mask"); /* should always be float */ - + lanpr_dpix_batch_free(); BLI_mempool_clear(lanpr_share.mp_batch_list); diff --git a/source/blender/makesrna/intern/rna_lanpr.c b/source/blender/makesrna/intern/rna_lanpr.c index 8d90c1171fd..2664ffe7436 100644 --- a/source/blender/makesrna/intern/rna_lanpr.c +++ b/source/blender/makesrna/intern/rna_lanpr.c @@ -46,19 +46,20 @@ #else -static void rna_def_lanpr_line_layer(BlenderRNA* brna){ +static void rna_def_lanpr_line_layer(BlenderRNA *brna) +{ StructRNA *srna; PropertyRNA *prop; -static const EnumPropertyItem rna_enum_lanpr_normal_mode[] = { - {LANPR_NORMAL_DIRECTIONAL, - "DIRECTIONAL", - 0, - "Directional", - "Use directional vector to control line width"}, - /* Seems working... */ - {LANPR_NORMAL_POINT, "POINT", 0, "Point", "Use Point Light Style"}, - {0, NULL, 0, NULL, NULL}}; + static const EnumPropertyItem rna_enum_lanpr_normal_mode[] = { + {LANPR_NORMAL_DIRECTIONAL, + "DIRECTIONAL", + 0, + "Directional", + "Use directional vector to control line width"}, + /* Seems working... */ + {LANPR_NORMAL_POINT, "POINT", 0, "Point", "Use Point Light Style"}, + {0, NULL, 0, NULL, NULL}}; srna = RNA_def_struct(brna, "LANPR_LineLayer", NULL); RNA_def_struct_sdna(srna, "LANPR_LineLayer"); @@ -160,7 +161,8 @@ static const EnumPropertyItem rna_enum_lanpr_normal_mode[] = { RNA_def_property_ui_text(prop, "Components", "Line Layer Components"); } -static void rna_def_lanpr_line_type(BlenderRNA* brna){ +static void rna_def_lanpr_line_type(BlenderRNA *brna) +{ StructRNA *srna; PropertyRNA *prop; @@ -181,10 +183,10 @@ static void rna_def_lanpr_line_type(BlenderRNA* brna){ RNA_def_property_array(prop, 3); RNA_def_property_ui_text(prop, "Color", "Color of this line type"); RNA_def_property_ui_range(prop, 0.0f, 1.0f, 0.1, 2); - } -static void rna_def_lanpr_line_component(BlenderRNA* brna){ +static void rna_def_lanpr_line_component(BlenderRNA *brna) +{ StructRNA *srna; PropertyRNA *prop; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs