From d930c63f0367bbd56832be3eecbc39bbbb7f024a Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Sun, 11 May 2014 17:48:55 +0900 Subject: Freestyle: Fix for the active line set index possibly invalidated after deleting a line set. --- source/blender/blenkernel/intern/freestyle.c | 1 + source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/source/blender/blenkernel/intern/freestyle.c b/source/blender/blenkernel/intern/freestyle.c index 2ab49538ba2..4bf68af8b65 100644 --- a/source/blender/blenkernel/intern/freestyle.c +++ b/source/blender/blenkernel/intern/freestyle.c @@ -207,6 +207,7 @@ bool BKE_freestyle_lineset_delete(FreestyleConfig *config, FreestyleLineSet *lin } BLI_remlink(&config->linesets, lineset); MEM_freeN(lineset); + BKE_freestyle_lineset_set_active_index(config, 0); return true; } diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index a0e2fc90641..49c3fdce251 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -712,7 +712,6 @@ void FRS_delete_active_lineset(FreestyleConfig *config) if (lineset) { BKE_freestyle_lineset_delete(config, lineset); - BKE_freestyle_lineset_set_active_index(config, 0); } } -- cgit v1.2.3