[Bf-blender-cvs] [d930c63] master: Freestyle: Fix for the active line set index possibly invalidated after deleting a line set.

Tamito Kajiyama noreply at git.blender.org
Sun May 11 10:58:25 CEST 2014


Commit: d930c63f0367bbd56832be3eecbc39bbbb7f024a
Author: Tamito Kajiyama
Date:   Sun May 11 17:48:55 2014 +0900
https://developer.blender.org/rBd930c63f0367bbd56832be3eecbc39bbbb7f024a

Freestyle: Fix for the active line set index possibly invalidated after deleting a line set.

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

M	source/blender/blenkernel/intern/freestyle.c
M	source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp

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

diff --git a/source/blender/blenkernel/intern/freestyle.c b/source/blender/blenkernel/intern/freestyle.c
index 2ab4953..4bf68af 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 a0e2fc9..49c3fdc 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);
 	}
 }




More information about the Bf-blender-cvs mailing list