svn merge ^/trunk/blender -r41961:41998
[blender-staging.git] / source / blender / editors / space_view3d / drawobject.c
index 44bacd7a20eda1449deab94fdc6df349b95e72a9..959e267f50e214575ef0d986b17a2c18752c58f0 100644 (file)
@@ -1696,7 +1696,7 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
                        if(cam->flag & CAM_SHOWLIMITS) {
                                draw_limit_line(cam->clipsta, cam->clipend, 0x77FFFF);
                                /* qdn: was yafray only, now also enabled for Blender to be used with defocus composit node */
-                               draw_focus_cross(dof_camera(ob), cam->drawsize);
+                               draw_focus_cross(object_camera_dof_distance(ob), cam->drawsize);
                        }
 
                        wrld= scene->world;