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>2012-06-12 02:20:46 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2012-06-12 02:20:46 +0400
commit295976b7791e8005f82bb8644835b6feed10c861 (patch)
tree7958ac68a9fb6e8948476252f434b7e633aaef31 /source/blender
parent8135cc9f954e0d63ab3e97d4a7c52ff5e573eef0 (diff)
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!
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
index 650a3419d22..6e7ea95f046 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.cpp
@@ -40,7 +40,7 @@ NodeGroup* BlenderFileLoader::Load()
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) <<;