svn merge -r 22571:22800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender-staging.git] / source / blender / render / intern / source / rendercore.c
index 94d7651a03c4adf6a7c468c99cb6cc723df82a7c..f3db64295a3c087a9656babf6a08d261798de1c6 100644 (file)
@@ -2246,7 +2246,7 @@ static int bake_check_intersect(Isect *is, int ob, RayFace *face)
        /* no direction checking for now, doesn't always improve the result
         * (INPR(shi->facenor, bs->dir) > 0.0f); */
 
-       return (R.objectinstance[ob].obr->ob != bs->actob);
+       return (R.objectinstance[ob & ~RE_RAY_TRANSFORM_OFFS].obr->ob != bs->actob);
 }
 #endif