diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-07-29 19:27:03 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-07-29 19:27:03 +0400 |
| commit | c23532715281f7e14d750f019919b247920cdb50 (patch) | |
| tree | dfb84f6a4135ad5468e8e46a53451299bf12a476 /source/gameengine/Ketsji/KX_Scene.cpp | |
| parent | 3131858792e9a99c19d698e092e2b975c1b3aec9 (diff) | |
svn merge -r15780:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Ketsji/KX_Scene.cpp')
| -rw-r--r-- | source/gameengine/Ketsji/KX_Scene.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp index 05730dfcdcc..772625b8a0b 100644 --- a/source/gameengine/Ketsji/KX_Scene.cpp +++ b/source/gameengine/Ketsji/KX_Scene.cpp @@ -658,7 +658,7 @@ void KX_Scene::DupliGroupRecurse(CValue* obj, int level) // Should not happen as dupli group are created automatically continue; } - if (blenderobj->lay & group->layer==0) + if ((blenderobj->lay & group->layer)==0) { // object is not visible in the 3D view, will not be instantiated continue; |