From 002dbaece721beaacf7da149309214f2dc9111af Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Fri, 5 Apr 2013 16:55:12 +0000 Subject: style cleanup --- source/blender/blenkernel/intern/bpath.c | 4 ++-- source/blender/blenkernel/intern/group.c | 5 +++-- source/blender/blenkernel/intern/object.c | 2 +- source/blender/blenkernel/intern/text.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'source/blender/blenkernel/intern') diff --git a/source/blender/blenkernel/intern/bpath.c b/source/blender/blenkernel/intern/bpath.c index 806b944572f..1dbb02df740 100644 --- a/source/blender/blenkernel/intern/bpath.c +++ b/source/blender/blenkernel/intern/bpath.c @@ -590,8 +590,8 @@ void BKE_bpath_traverse_id(Main *bmain, ID *id, BPathVisitor visit_cb, const int for (; module; module = module->next) { rewrite_path_fixed(module->module_path, visit_cb, absbase, bpath_user_data); } - } - } + } + } #endif break; } diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index d0a9a6efe6b..b1d0e8df754 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -79,7 +79,6 @@ void BKE_group_unlink(Group *group) Object *ob; Scene *sce; SceneRenderLayer *srl; - FreestyleLineSet *lineset; ParticleSystem *psys; for (ma = bmain->mat.first; ma; ma = ma->id.next) { @@ -104,9 +103,11 @@ void BKE_group_unlink(Group *group) } for (srl = sce->r.layers.first; srl; srl = srl->next) { + FreestyleLineSet *lineset; + if (srl->light_override == group) srl->light_override = NULL; - for(lineset = srl->freestyleConfig.linesets.first; lineset; lineset= lineset->next) { + for (lineset = srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) { if (lineset->group == group) lineset->group = NULL; } diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 3750eadb6db..a5f05053bfc 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -681,7 +681,7 @@ void BKE_object_unlink(Object *ob) SEQ_END } - for (srl= sce->r.layers.first; srl; srl= srl->next) { + for (srl = sce->r.layers.first; srl; srl = srl->next) { for (lineset = (FreestyleLineSet *)srl->freestyleConfig.linesets.first; lineset; lineset = lineset->next) { diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 4527d2a5056..842f495dffe 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -614,7 +614,7 @@ void BKE_text_unlink(Main *bmain, Text *text) /* Freestyle */ for (sce = bmain->scene.first; sce; sce = sce->id.next) { for (srl = sce->r.layers.first; srl; srl = srl->next) { - for (module = srl->freestyleConfig.modules.first; module; module= module->next) { + for (module = srl->freestyleConfig.modules.first; module; module = module->next) { if (module->script == text) module->script = NULL; } -- cgit v1.2.3