[Bf-blender-cvs] [2048db06d3f] master: Fix T66694: depthdropper (camera focus distance) not working from View3D context menu

[Philipp Oeser]

Commit: 2048db06d3f0a4f59d94036c57e9cb4fee1db82b
Author: Philipp Oeser
Date:   Thu Jul 11 17:53:13 2019 +0200
Branches: master
https://developer.blender.org/rB2048db06d3f0a4f59d94036c57e9cb4fee1db82b

Fix T66694: depthdropper (camera focus distance) not working from View3D context menu

Reviewers: campbellbarton, brecht

Maniphest Tasks: T66694

Differential Revision: https://developer.blender.org/D5233

===================================================================

M	source/blender/editors/interface/interface_eyedropper_depth.c

===================================================================

diff --git a/source/blender/editors/interface/interface_eyedropper_depth.c b/source/blender/editors/interface/interface_eyedropper_depth.c
index adb317f488c..fc60fc06ac0 100644
--- a/source/blender/editors/interface/interface_eyedropper_depth.c
+++ b/source/blender/editors/interface/interface_eyedropper_depth.c
@@ -31,6 +31,7 @@
 #include "DNA_space_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_object_types.h"
+#include "DNA_camera_types.h"
 #include "DNA_view3d_types.h"
 
 #include "BLI_string.h"
@@ -102,8 +103,9 @@ static int depthdropper_init(bContext *C, wmOperator *op)
     if (rv3d && rv3d->persp == RV3D_CAMOB) {
       View3D *v3d = CTX_wm_view3d(C);
       if (v3d->camera && v3d->camera->data && !ID_IS_LINKED(v3d->camera->data)) {
-        RNA_id_pointer_create(v3d->camera->data, &ddr->ptr);
-        ddr->prop = RNA_struct_find_property(&ddr->ptr, "dof_distance");
+        Camera *camera = (Camera *)v3d->camera->data;
+        RNA_pointer_create(&camera->id, &RNA_CameraDOFSettings, &camera->dof, &ddr->ptr);
+        ddr->prop = RNA_struct_find_property(&ddr->ptr, "focus_distance");
         ddr->is_undo = true;
       }
     }