diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-22 01:30:05 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2013-03-22 01:30:05 +0400 |
| commit | 0fd8e638b683d842decb18b40eb70e4f718330fc (patch) | |
| tree | 37b3f6d4cfaf774b08ed8f28bf1c9f0a9a225469 | |
| parent | 1f6c9d18ed3b26b52aa99cd89441d96b63b7f173 (diff) | |
Fix for default values different from the factory settings.
Suggested by IRIE Shinsuke through a code review of the branch.
| -rw-r--r-- | source/blender/blenkernel/intern/linestyle.c | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index 3b02e705d46..f017b4a97cd 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -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; diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index bbfcfbfa13d..a5003302653 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -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; |