[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47763] branches/soc-2008-mxcurioni/source /blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp: Fix for emitted objects of a particle system not rendered properly.

[Tamito Kajiyama]

Revision: 47763
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47763
Author:   kjym3
Date:     2012-06-11 22:20:46 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Fix for emitted objects of a particle system not rendered properly.
Problem report by octane98 in the BA Freestyle thread with a sample .blend file.  Thanks!

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp	2012-06-11 22:09:15 UTC (rev 47762)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp	2012-06-11 22:20:46 UTC (rev 47763)
@@ -40,7 +40,7 @@
 
 	int id = 0;
 	for(obi= (ObjectInstanceRen *) _re->instancetable.first; obi; obi=obi->next) {
-		if (!(obi->lay & _re->scene->lay & _srl->lay))
+		if (!(obi->lay & _srl->lay))
 			continue;
 		char *name = obi->ob->id.name;
 		//cout << name[0] << name[1] << ":" << (name+2) <<;