diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 11:56:54 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-07 11:56:54 +0400 |
| commit | d8e2ed8ae2257c9e301dd85127cab5d6cc2b6a58 (patch) | |
| tree | b8402f51476ad78d175411f2ef733816dd7a4fcd /source/blender/gpu/intern/gpu_material.c | |
| parent | 5323a2f18f0e004a2e2cf6d619a6f93456c47f03 (diff) | |
| parent | db5682ac8c53377e819fd50357de580c02405fca (diff) | |
svn merge ^/trunk/blender -r50999:51100soc-2012-bratwurst
Diffstat (limited to 'source/blender/gpu/intern/gpu_material.c')
| -rw-r--r-- | source/blender/gpu/intern/gpu_material.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_material.c b/source/blender/gpu/intern/gpu_material.c index dd92b561235..87315b3f779 100644 --- a/source/blender/gpu/intern/gpu_material.c +++ b/source/blender/gpu/intern/gpu_material.c @@ -843,7 +843,7 @@ static void material_lights(GPUShadeInput *shi, GPUShadeResult *shr) if (ob->transflag & OB_DUPLI) { DupliObject *dob; - ListBase *lb = object_duplilist(shi->gpumat->scene, ob); + ListBase *lb = object_duplilist(shi->gpumat->scene, ob, FALSE); for (dob=lb->first; dob; dob=dob->next) { Object *ob_iter = dob->ob; |