diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-01 19:21:29 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-01 19:21:29 +0400 |
| commit | 3f82dcb2df77cbac825c400405d63dc663d00928 (patch) | |
| tree | c3c97d75ffaab1ebb93675d531b684373799bbfc /source | |
| parent | b09ac48d0f95c42848fb25973f23efba9bba6417 (diff) | |
Fix #31110: selected to active baking did not properly check to see if the
object was actually selected, so e.g. baking shadows cast from non-selected
objects did not work.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/raytrace/rayobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/raytrace/rayobject.cpp b/source/blender/render/intern/raytrace/rayobject.cpp index a2773ba218d..ac29d9e78ee 100644 --- a/source/blender/render/intern/raytrace/rayobject.cpp +++ b/source/blender/render/intern/raytrace/rayobject.cpp @@ -127,7 +127,7 @@ MALWAYS_INLINE int vlr_check_intersect_solid(Isect *UNUSED(is), ObjectInstanceRe MALWAYS_INLINE int vlr_check_bake(Isect *is, ObjectInstanceRen* obi, VlakRen *UNUSED(vlr)) { - return (obi->obr->ob != is->userdata); + return (obi->obr->ob != is->userdata) && (obi->obr->ob->flag & SELECT); } /* Ray Triangle/Quad Intersection */ |