bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

Added BKE_freestyle_lineset_delete() by generalizing FRS_delete_active_lineset().

Browse Source
This commit is contained in:
Tamito Kajiyama 2014-05-10 23:32:22 +09:00
parent c88e65da61
commit 39c078202d
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/BKE_freestyle.h
View File

@ -51,6 +51,7 @@ void BKE_freestyle_module_move_down(FreestyleConfig *config, FreestyleModuleConf
/* FreestyleConfig.linesets */
FreestyleLineSet *BKE_freestyle_lineset_add(FreestyleConfig *config);
bool BKE_freestyle_lineset_delete(FreestyleConfig *config, FreestyleLineSet *lineset);
FreestyleLineSet *BKE_freestyle_lineset_get_active(FreestyleConfig *config);
short BKE_freestyle_lineset_get_active_index(FreestyleConfig *config);
void BKE_freestyle_lineset_set_active_index(FreestyleConfig *config, short index);

15
source/blender/blenkernel/intern/freestyle.c
View File

@ -195,6 +195,21 @@ FreestyleLineSet *BKE_freestyle_lineset_add(FreestyleConfig *config)
return lineset;
}
bool BKE_freestyle_lineset_delete(FreestyleConfig *config, FreestyleLineSet *lineset)
{
if (BLI_findindex(&config->linesets, lineset) == -1)
return false;
if (lineset->group) {
lineset->group->id.us--;
}
if (lineset->linestyle) {
lineset->linestyle->id.us--;
}
BLI_remlink(&config->linesets, lineset);
MEM_freeN(lineset);
return true;
}
FreestyleLineSet *BKE_freestyle_lineset_get_active(FreestyleConfig *config)
{
FreestyleLineSet *lineset;

9
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
View File

@ -711,14 +711,7 @@ void FRS_delete_active_lineset(FreestyleConfig *config)
FreestyleLineSet *lineset = BKE_freestyle_lineset_get_active(config);
if (lineset) {
if (lineset->group) {
lineset->group->id.us--;
}
if (lineset->linestyle) {
lineset->linestyle->id.us--;
}
BLI_remlink(&config->linesets, lineset);
MEM_freeN(lineset);
BKE_freestyle_lineset_delete(config, lineset);
BKE_freestyle_lineset_set_active_index(config, 0);
}
}