kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix for default values different from the factory settings.

Browse Source 
Suggested by IRIE Shinsuke through a code review of the branch.
This commit is contained in:
Tamito Kajiyama 2013-03-21 21:30:05 +00:00
parent 1f6c9d18ed
commit 0fd8e638b6
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/linestyle.c
View File

@ -76,7 +76,7 @@ static const char *modifier_name[LS_MODIFIER_NUM] = {
static void default_linestyle_settings(FreestyleLineStyle *linestyle) static void default_linestyle_settings(FreestyleLineStyle *linestyle)
{ {
linestyle->panel = LS_PANEL_STROKES; 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->alpha = 1.0f;
linestyle->thickness = 1.0f; linestyle->thickness = 1.0f;
linestyle->thickness_position = LS_THICKNESS_CENTER; linestyle->thickness_position = LS_THICKNESS_CENTER;

6
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
View File

@ -642,13 +642,13 @@ void FRS_finish_stroke_rendering(Render *re)
void FRS_init_freestyle_config(FreestyleConfig *config) 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->modules.first = config->modules.last = NULL;
config->flags = 0; config->flags = 0;
config->sphere_radius = DEFAULT_SPHERE_RADIUS; config->sphere_radius = DEFAULT_SPHERE_RADIUS;
config->dkr_epsilon = DEFAULT_DKR_EPSILON; 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; 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->linestyle = FRS_new_linestyle("LineStyle", NULL);
lineset->flags |= FREESTYLE_LINESET_ENABLED; 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 = FREESTYLE_QI_VISIBLE;
lineset->qi_start = 0; lineset->qi_start = 0;
lineset->qi_end = 100; lineset->qi_end = 100;