[Bf-blender-cvs] [43703fa] master: Fix T50008: camera DOF Distance picking from W key menu not working.
Brecht Van Lommel
noreply at git.blender.org
Sat Nov 12 22:35:18 CET 2016
Commit: 43703fa4bf446c5726a7dd435c1eaa589431b573
Author: Brecht Van Lommel
Date: Sat Nov 12 22:29:49 2016 +0100
Branches: master
https://developer.blender.org/rB43703fa4bf446c5726a7dd435c1eaa589431b573
Fix T50008: camera DOF Distance picking from W key menu not working.
===================================================================
M source/blender/editors/interface/interface_eyedropper.c
===================================================================
diff --git a/source/blender/editors/interface/interface_eyedropper.c b/source/blender/editors/interface/interface_eyedropper.c
index 31598a4..d7f06b7 100644
--- a/source/blender/editors/interface/interface_eyedropper.c
+++ b/source/blender/editors/interface/interface_eyedropper.c
@@ -1083,6 +1083,15 @@ static int depthdropper_poll(bContext *C)
return 1;
}
}
+ else {
+ RegionView3D *rv3d = CTX_wm_region_view3d(C);
+ if (rv3d && rv3d->persp == RV3D_CAMOB) {
+ View3D *v3d = CTX_wm_view3d(C);
+ if (v3d->camera && v3d->camera->data && !ID_IS_LINKED_DATABLOCK(v3d->camera->data)) {
+ return 1;
+ }
+ }
+ }
return 0;
}
More information about the Bf-blender-cvs
mailing list