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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-09-27 19:30:13 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-09-27 19:30:13 +0400
commit509e7c5cdf8da89d75def7b2dc73ec3a21c9bdc5 (patch)
tree05b500f59e12f905352cbd9b2660b0faefa9c9e8 /source/blender/render
parent771c49b9914731d21c4079ef30b60e56707dad2c (diff)
Fix #32670: lamps in lamp groups did not respect renderability option.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/convertblender.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index f344da9725f..874999a8aae 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3929,6 +3929,9 @@ static void add_lightgroup(Render *re, Group *group, int exclusive)
/* note that 'exclusive' will remove it from the global list */
for (go= group->gobject.first; go; go= go->next) {
go->lampren= NULL;
+
+ if(go->ob->restrictflag & OB_RESTRICT_RENDER)
+ continue;
if (go->ob->lay & re->lay) {
if (go->ob && go->ob->type==OB_LAMP) {