diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-11 12:48:55 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-05-11 12:57:41 +0400 |
| commit | d930c63f0367bbd56832be3eecbc39bbbb7f024a (patch) | |
| tree | b0f7d901ec8a04278dd84279116b269da2c9d792 | |
| parent | bbd611362c9ae0b02a25e960866f4f29227b5457 (diff) | |
Freestyle: Fix for the active line set index possibly invalidated after deleting a line set.
| -rw-r--r-- | source/blender/blenkernel/intern/freestyle.c | 1 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 1 |
2 files changed, 1 insertions, 1 deletions
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); } } |