[Bf-blender-cvs] [60f7f93] master: Freestyle: Fix for a few line style properties left not copied.

Tamito Kajiyama noreply at git.blender.org
Mon Mar 9 04:55:26 CET 2015


Commit: 60f7f93c16878db0a1abbe1f610d08ce6d518775
Author: Tamito Kajiyama
Date:   Sun Mar 8 15:27:13 2015 +0900
Branches: master
https://developer.blender.org/rB60f7f93c16878db0a1abbe1f610d08ce6d518775

Freestyle: Fix for a few line style properties left not copied.

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

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

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

diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index 1a5760b..b97bf0e 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -199,8 +199,11 @@ FreestyleLineStyle *BKE_linestyle_copy(FreestyleLineStyle *linestyle)
 	new_linestyle->dash3 = linestyle->dash3;
 	new_linestyle->gap3 = linestyle->gap3;
 	new_linestyle->panel = linestyle->panel;
+	new_linestyle->sort_key = linestyle->sort_key;
+	new_linestyle->integration_type = linestyle->integration_type;
 	new_linestyle->texstep = linestyle->texstep;
 	new_linestyle->pr_texture = linestyle->pr_texture;
+	new_linestyle->use_nodes = linestyle->use_nodes;
 	for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m = m->next)
 		BKE_linestyle_color_modifier_copy(new_linestyle, m);
 	for (m = (LineStyleModifier *)linestyle->alpha_modifiers.first; m; m = m->next)




More information about the Bf-blender-cvs mailing list