[Bf-blender-cvs] [c70e6a2e217] master: Fix T69153: Camera DOF gizmo fails

Campbell Barton noreply at git.blender.org
Mon Aug 26 09:07:36 CEST 2019


Commit: c70e6a2e21759834698ac57fc94607bfa9ae3f99
Author: Campbell Barton
Date:   Mon Aug 26 17:04:47 2019 +1000
Branches: master
https://developer.blender.org/rBc70e6a2e21759834698ac57fc94607bfa9ae3f99

Fix T69153: Camera DOF gizmo fails

Regression from bc3139d792268

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

M	source/blender/editors/space_view3d/view3d_gizmo_camera.c

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

diff --git a/source/blender/editors/space_view3d/view3d_gizmo_camera.c b/source/blender/editors/space_view3d/view3d_gizmo_camera.c
index 1bb10697936..eebfdaf38ff 100644
--- a/source/blender/editors/space_view3d/view3d_gizmo_camera.c
+++ b/source/blender/editors/space_view3d/view3d_gizmo_camera.c
@@ -152,9 +152,11 @@ static void WIDGETGROUP_camera_refresh(const bContext *C, wmGizmoGroup *gzgroup)
     WM_gizmo_set_scale(cagzgroup->dop_dist, ca->drawsize);
     WM_gizmo_set_flag(cagzgroup->dop_dist, WM_GIZMO_HIDDEN, false);
 
-    /* need to set property here for undo. TODO would prefer to do this in _init */
+    /* Need to set property here for undo. TODO would prefer to do this in _init */
+    PointerRNA camera_dof_ptr;
+    RNA_pointer_create(&ca->id, &RNA_CameraDOFSettings, &ca->dof, &camera_dof_ptr);
     WM_gizmo_target_property_def_rna(
-        cagzgroup->dop_dist, "offset", &camera_ptr, "dof.focus_distance", -1);
+        cagzgroup->dop_dist, "offset", &camera_dof_ptr, "focus_distance", -1);
   }
   else {
     WM_gizmo_set_flag(cagzgroup->dop_dist, WM_GIZMO_HIDDEN, true);



More information about the Bf-blender-cvs mailing list