Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-09-15 03:21:44 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2011-09-15 03:21:44 +0400
commit7ae9a81323cf7a12356831e4a2ed4df06f924581 (patch)
tree42f9d59d443d399ac0fc1ecac8be296ece593d2e /source/blender/blenkernel/intern/group.c
parentac796827cbe88cfa52e1b5196a196355560b9121 (diff)
Fix for a bug that unlinking a group overlooked a reference to the group in linesets.
Diffstat (limited to 'source/blender/blenkernel/intern/group.c')
-rw-r--r--source/blender/blenkernel/intern/group.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index d96b00f7990..41185c88179 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -81,6 +81,7 @@ void unlink_group(Group *group)
Object *ob;
Scene *sce;
SceneRenderLayer *srl;
+ FreestyleLineSet *lineset;
ParticleSystem *psys;
for(ma= bmain->mat.first; ma; ma= ma->id.next) {
@@ -105,6 +106,11 @@ void unlink_group(Group *group)
for(srl= sce->r.layers.first; srl; srl= srl->next) {
if (srl->light_override==group)
srl->light_override= NULL;
+
+ for(lineset= srl->freestyleConfig.linesets.first; lineset; lineset= lineset->next) {
+ if (lineset->group == group)
+ lineset->group= NULL;
+ }
}
}