Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-18 12:45:38 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-18 12:50:55 +0300
commita82bc705121fb54af23cad55003b0988808c1561 (patch)
tree56d3a15848402f9cf1e1c278543a4195783978f1 /source/blender/collada
parent07c67148e36d95ac185c553ceacbdb6896ae46ca (diff)
Fix use of deprecated DoF distance property
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/CameraExporter.cpp2
-rw-r--r--source/blender/collada/DocumentImporter.cpp2
2 files changed, 2 insertions, 2 deletions
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();