Fix for default values different from the factory settings.
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 21 Mar 2013 21:30:05 +0000 (21:30 +0000)
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>
Thu, 21 Mar 2013 21:30:05 +0000 (21:30 +0000)
Suggested by IRIE Shinsuke through a code review of the branch.

source/blender/blenkernel/intern/linestyle.c
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp

index 3b02e705d46daf31826cbdad982c56207cd882de..f017b4a97cd807d9520322b82ca774938b1f59cf 100644 (file)
@@ -76,7 +76,7 @@ static const char *modifier_name[LS_MODIFIER_NUM] = {
 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;
index bbfcfbfa13dacccbd67b1fe6bc3951155c9715b0..a500330265342af6e40be9d06d969dfe5ef73527 100644 (file)
@@ -642,13 +642,13 @@ void FRS_finish_stroke_rendering(Render *re)
 
 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 @@ FreestyleLineSet *FRS_add_lineset(FreestyleConfig *config)
 
        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;