Commit: e9bac3a23a7d4eea0b8f91e3e9f24018602b737f Author: YimingWu Date: Fri Jul 5 15:16:58 2019 +0800 Branches: soc-2019-npr https://developer.blender.org/rBe9bac3a23a7d4eea0b8f91e3e9f24018602b737f
LANPR: Modified default values for better initial experience. =================================================================== M source/blender/blenloader/intern/versioning_280.c M source/blender/draw/engines/lanpr/lanpr_ops.c =================================================================== diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index 1188ff080f3..177da8ee5df 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -3529,20 +3529,20 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) sce->lanpr.enable_intersections = 1; - sce->lanpr.background_color[0] = 0; - sce->lanpr.background_color[1] = 0; - sce->lanpr.background_color[2] = 0; + sce->lanpr.background_color[0] = 0.75; + sce->lanpr.background_color[1] = 0.75; + sce->lanpr.background_color[2] = 0.75; sce->lanpr.background_color[3] = 1; - sce->lanpr.line_color[0] = 1; - sce->lanpr.line_color[1] = 1; - sce->lanpr.line_color[2] = 1; - sce->lanpr.line_color[3] = 1; + sce->lanpr.line_color[0] = 0; + sce->lanpr.line_color[1] = 0; + sce->lanpr.line_color[2] = 0; + sce->lanpr.line_color[3] = 0; sce->lanpr.enable_intersections = 1; sce->lanpr.enable_chaining = 1; - sce->lanpr.chaining_image_threshold = 0.01; - sce->lanpr.chaining_geometry_threshold = 0.1; + sce->lanpr.chaining_image_threshold = 0.01f; + sce->lanpr.chaining_geometry_threshold = 0.0f; sce->lanpr.disable_edge_splits = 1; } diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c index 8c24a86a611..da56830c4e7 100644 --- a/source/blender/draw/engines/lanpr/lanpr_ops.c +++ b/source/blender/draw/engines/lanpr/lanpr_ops.c @@ -4456,9 +4456,9 @@ LANPR_LineLayer *lanpr_new_line_layer(SceneLANPR *lanpr) ll->qi_begin = ll->qi_end = max_occ + 1; ll->use_same_style = 1; ll->thickness = 1.0f; - ll->color[0] = 1.0f; - ll->color[1] = 1.0f; - ll->color[2] = 1.0f; + ll->color[0] = 0.0f; + ll->color[1] = 0.0f; + ll->color[2] = 0.0f; ll->color[3] = 1.0f; ll->enable_contour = 1; ll->enable_crease = 1; @@ -4647,9 +4647,9 @@ int lanpr_auto_create_line_layer_exec(struct bContext *C, struct wmOperator *op) ll = lanpr_new_line_layer(lanpr); ll->thickness = 1.7; - ll->color[0] = 1; - ll->color[1] = 1; - ll->color[2] = 1; + ll->color[0] = 0; + ll->color[1] = 0; + ll->color[2] = 0; lanpr_enable_all_line_types_exec(C, op); @@ -4657,8 +4657,8 @@ int lanpr_auto_create_line_layer_exec(struct bContext *C, struct wmOperator *op) ll->thickness = 0.9; ll->qi_begin = 1; ll->qi_end = 1; - ll->color[0] = 0.314; - ll->color[1] = 0.596; + ll->color[0] = 0.1; + ll->color[1] = 0.1; ll->color[2] = 1; lanpr_enable_all_line_types_exec(C, op); @@ -4667,9 +4667,9 @@ int lanpr_auto_create_line_layer_exec(struct bContext *C, struct wmOperator *op) ll->thickness = 0.7; ll->qi_begin = 2; ll->qi_end = 2; - ll->color[0] = 0.135; - ll->color[1] = 0.304; - ll->color[2] = 0.508; + ll->color[0] = 0.2; + ll->color[1] = 0.2; + ll->color[2] = 0.2; lanpr_enable_all_line_types_exec(C, op); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs