[Bf-blender-cvs] [a82bc705121] master: Fix use of deprecated DoF distance property

[Brecht Van Lommel]

Commit: a82bc705121fb54af23cad55003b0988808c1561
Author: Brecht Van Lommel
Date:   Sat May 18 11:45:38 2019 +0200
Branches: master
https://developer.blender.org/rBa82bc705121fb54af23cad55003b0988808c1561

Fix use of deprecated DoF distance property

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

M	source/blender/collada/CameraExporter.cpp
M	source/blender/collada/DocumentImporter.cpp

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

diff --git a/source/blender/collada/CameraExporter.cpp b/source/blender/collada/CameraExporter.cpp
index d318a90909e..a46ee74be91 100644
--- a/source/blender/collada/CameraExporter.cpp
+++ b/source/blender/collada/CameraExporter.cpp
@@ -94,6 +94,6 @@ bool CamerasExporter::exportBlenderProfile(COLLADASW::Camera &cm, Camera *cam)
 {
   cm.addExtraTechniqueParameter("blender", "shiftx", cam->shiftx);
   cm.addExtraTechniqueParameter("blender", "shifty", cam->shifty);
-  cm.addExtraTechniqueParameter("blender", "dof_distance", cam->dof_distance);
+  cm.addExtraTechniqueParameter("blender", "dof_distance", cam->dof.focus_distance);
   return true;
 }
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 91dda6955ef..3aceebe0422 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -859,7 +859,7 @@ bool DocumentImporter::writeCamera(const COLLADAFW::Camera *camera)
   if (et && et->isProfile("blender")) {
     et->setData("shiftx", &(cam->shiftx));
     et->setData("shifty", &(cam->shifty));
-    et->setData("dof_distance", &(cam->dof_distance));
+    et->setData("dof_distance", &(cam->dof.focus_distance));
   }
   cam->clip_start = camera->getNearClippingPlane().getValue();
   cam->clip_end = camera->getFarClippingPlane().getValue();