[Bf-committers] [Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55484] branches/soc-2008-mxcurioni/source /blender: Fix for default values different from the factory settings.

[IRIE Shinsuke]

Hi Tamito-san,

I think the default line color (and the factory setting) should be
black rather than white, because most of all cartoon pictures use dark
color outlines.

IRIE Shinsuke

13/03/22, Tamito Kajiyama wrote:
> Revision: 55484
>            http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55484
> Author:   kjym3
> Date:     2013-03-21 21:30:05 +0000 (Thu, 21 Mar 2013)
> Log Message:
> -----------
> Fix for default values different from the factory settings.
> Suggested by IRIE Shinsuke through a code review of the branch.
>
> Modified Paths:
> --------------
>      branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
>      branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
>
> Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c	2013-03-21 21:10:14 UTC (rev 55483)
> +++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c	2013-03-21 21:30:05 UTC (rev 55484)
> @@ -76,7 +76,7 @@
>   static void default_linestyle_settings(FreestyleLineStyle *linestyle)
>   {
>   	linestyle->panel = LS_PANEL_STROKES;
> -	linestyle->r = linestyle->g = linestyle->b = 0.0f;
> +	linestyle->r = linestyle->g = linestyle->b = 1.0f;
>   	linestyle->alpha = 1.0f;
>   	linestyle->thickness = 1.0f;
>   	linestyle->thickness_position = LS_THICKNESS_CENTER;
>
> Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp	2013-03-21 21:10:14 UTC (rev 55483)
> +++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp	2013-03-21 21:30:05 UTC (rev 55484)
> @@ -642,13 +642,13 @@
>
>   void FRS_init_freestyle_config(FreestyleConfig *config)
>   {
> -	config->mode = FREESTYLE_CONTROL_SCRIPT_MODE;
> +	config->mode = FREESTYLE_CONTROL_EDITOR_MODE;
>
>   	config->modules.first = config->modules.last = NULL;
>   	config->flags = 0;
>   	config->sphere_radius = DEFAULT_SPHERE_RADIUS;
>   	config->dkr_epsilon = DEFAULT_DKR_EPSILON;
> -	config->crease_angle = DEG2RADF(120.0f);
> +	config->crease_angle = DEG2RADF(134.43f);
>
>   	config->linesets.first = config->linesets.last = NULL;
>   }
> @@ -773,7 +773,7 @@
>
>   	lineset->linestyle = FRS_new_linestyle("LineStyle", NULL);
>   	lineset->flags |= FREESTYLE_LINESET_ENABLED;
> -	lineset->selection = FREESTYLE_SEL_IMAGE_BORDER;
> +	lineset->selection = FREESTYLE_SEL_VISIBILITY | FREESTYLE_SEL_EDGE_TYPES | FREESTYLE_SEL_IMAGE_BORDER;
>   	lineset->qi = FREESTYLE_QI_VISIBLE;
>   	lineset->qi_start = 0;
>   	lineset->qi_end = 100;
>
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>