[Bf-blender-cvs] [308ec60] master: Fix for missing initialization and copying of FreestyleLineStyle::pr_texture value.

Tamito Kajiyama noreply at git.blender.org
Sat May 3 13:39:32 CEST 2014


Commit: 308ec601b28c8f663d85f09010c95a2168fba134
Author: Tamito Kajiyama
Date:   Wed Apr 23 13:38:19 2014 +0900
https://developer.blender.org/rB308ec601b28c8f663d85f09010c95a2168fba134

Fix for missing initialization and copying of FreestyleLineStyle::pr_texture value.

===================================================================

M	source/blender/blenkernel/intern/linestyle.c

===================================================================

diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index ee55cf7..b039593 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -92,6 +92,7 @@ static void default_linestyle_settings(FreestyleLineStyle *linestyle)
 	linestyle->sort_key = LS_SORT_KEY_DISTANCE_FROM_CAMERA;
 	linestyle->integration_type = LS_INTEGRATION_MEAN;
 	linestyle->texstep = 1.0f;
+	linestyle->pr_texture = TEX_PR_TEXTURE;
 
 	BLI_listbase_clear(&linestyle->color_modifiers);
 	BLI_listbase_clear(&linestyle->alpha_modifiers);
@@ -195,6 +196,7 @@ FreestyleLineStyle *BKE_copy_linestyle(FreestyleLineStyle *linestyle)
 	new_linestyle->gap3 = linestyle->gap3;
 	new_linestyle->panel = linestyle->panel;
 	new_linestyle->texstep = linestyle->texstep;
+	new_linestyle->pr_texture = linestyle->pr_texture;
 	for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next)
 		BKE_copy_linestyle_color_modifier(new_linestyle, m);
 	for (m = (LineStyleModifier *)linestyle->alpha_modifiers.first; m; m = m->next)




More information about the Bf-blender-cvs mailing list