[Bf-blender-cvs] [2f812e1d7bd] id_copy_refactor: Fix stupid mistake in new LineStyle copying code.

Bastien Montagne noreply at git.blender.org
Tue Jul 11 15:58:04 CEST 2017


Commit: 2f812e1d7bd3a2d4fcf32bf15659d0b60ec7ba01
Author: Bastien Montagne
Date:   Tue Jul 11 15:56:43 2017 +0200
Branches: id_copy_refactor
https://developer.blender.org/rB2f812e1d7bd3a2d4fcf32bf15659d0b60ec7ba01

Fix stupid mistake in new LineStyle copying code.

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

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

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

diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c
index 97aa2e2f47c..2147688cbda 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -180,15 +180,19 @@ void BKE_linestyle_copy_data(
 	}
 
 	LineStyleModifier *m;
+	BLI_listbase_clear(&linestyle_dst->color_modifiers);
 	for (m = (LineStyleModifier *)linestyle_src->color_modifiers.first; m; m = m->next) {
 		BKE_linestyle_color_modifier_copy(linestyle_dst, m, flag_subdata);
 	}
+	BLI_listbase_clear(&linestyle_dst->alpha_modifiers);
 	for (m = (LineStyleModifier *)linestyle_src->alpha_modifiers.first; m; m = m->next) {
 		BKE_linestyle_alpha_modifier_copy(linestyle_dst, m, flag_subdata);
 	}
+	BLI_listbase_clear(&linestyle_dst->thickness_modifiers);
 	for (m = (LineStyleModifier *)linestyle_src->thickness_modifiers.first; m; m = m->next) {
 		BKE_linestyle_thickness_modifier_copy(linestyle_dst, m, flag_subdata);
 	}
+	BLI_listbase_clear(&linestyle_dst->geometry_modifiers);
 	for (m = (LineStyleModifier *)linestyle_src->geometry_modifiers.first; m; m = m->next) {
 		BKE_linestyle_geometry_modifier_copy(linestyle_dst, m, flag_subdata);
 	}




More information about the Bf-blender-cvs mailing list