[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28461] branches/render25/source/blender/ render/intern/source/convertblender.c: Render Branch: Fix local light groups not working in some cases.

[Brecht Van Lommel]

Revision: 28461
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28461
Author:   blendix
Date:     2010-04-27 14:23:01 +0200 (Tue, 27 Apr 2010)

Log Message:
-----------
Render Branch: Fix local light groups not working in some cases.

Modified Paths:
--------------
    branches/render25/source/blender/render/intern/source/convertblender.c

Modified: branches/render25/source/blender/render/intern/source/convertblender.c
===================================================================
--- branches/render25/source/blender/render/intern/source/convertblender.c	2010-04-27 12:07:33 UTC (rev 28460)
+++ branches/render25/source/blender/render/intern/source/convertblender.c	2010-04-27 12:23:01 UTC (rev 28461)
@@ -223,7 +223,7 @@
 	/* it's a bit too many loops in loops... but will survive */
 	/* hola! materials not in use...? */
 	for(ma= G.main->mat.first; ma; ma=ma->id.next) {
-		if(ma->group && (ma->group->id.flag & LIB_DOIT)) {
+		if(ma->group) {
 			lightgroup= ma->group;
 
 			/* local group override */
@@ -235,6 +235,9 @@
 					}
 				}
 			}
+			
+			if(!(lightgroup->id.flag & LIB_DOIT))
+				break;
 
 			BLI_ghash_insert(re->db.lightgrouphash, ma->group, lightgroup);
 			lightgroup_create(re, lightgroup, ma->mode & MA_GROUP_EXCLUSIVE);