[Bf-blender-cvs] [caf0a76] alembic_basic_io: Cleanup: includes.
Kévin Dietrich
noreply at git.blender.org
Fri Jun 3 21:28:41 CEST 2016
Commit: caf0a762a25458376ae5b48687ffafc27d8064fa
Author: Kévin Dietrich
Date: Fri Jun 3 21:24:26 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBcaf0a762a25458376ae5b48687ffafc27d8064fa
Cleanup: includes.
===================================================================
M source/blender/alembic/intern/abc_camera.cc
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/abc_nurbs.cc
M source/blender/alembic/intern/abc_object.cc
===================================================================
diff --git a/source/blender/alembic/intern/abc_camera.cc b/source/blender/alembic/intern/abc_camera.cc
index 8a3a8d6..df0273b 100644
--- a/source/blender/alembic/intern/abc_camera.cc
+++ b/source/blender/alembic/intern/abc_camera.cc
@@ -30,14 +30,10 @@ extern "C" {
#include "DNA_object_types.h"
#include "BKE_camera.h"
-#include "BKE_depsgraph.h"
#include "BKE_object.h"
#include "BLI_math.h"
#include "BLI_string.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
}
using Alembic::AbcGeom::ICamera;
@@ -145,7 +141,7 @@ void AbcCameraReader::readObjectData(Main *bmain, Scene *scene, float time)
IFloatProperty eye_separation(customDataContainer, "eyeSeparation");
bcam->stereo.interocular_distance = eye_separation.getValue(sample_sel);
- bcam->stereo.convergence_distance = convergence_plane.getValue(sample_sel);;
+ bcam->stereo.convergence_distance = convergence_plane.getValue(sample_sel);
}
const float lens = cam_sample.getFocalLength();
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index dda2523..13ec127 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -38,7 +38,6 @@ extern "C" {
#include "BLI_string.h"
#include "BKE_DerivedMesh.h"
-#include "BKE_depsgraph.h"
#include "BKE_main.h"
#include "BKE_material.h"
#include "BKE_mesh.h"
@@ -46,9 +45,6 @@ extern "C" {
#include "BKE_object.h"
#include "ED_object.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
}
using Alembic::Abc::FloatArraySample;
diff --git a/source/blender/alembic/intern/abc_nurbs.cc b/source/blender/alembic/intern/abc_nurbs.cc
index 0a2ecb2..fdf374d 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -36,11 +36,7 @@ extern "C" {
#include "BLI_string.h"
#include "BKE_curve.h"
-#include "BKE_depsgraph.h"
#include "BKE_object.h"
-
-#include "WM_api.h"
-#include "WM_types.h"
}
using Alembic::AbcGeom::bool_t;
diff --git a/source/blender/alembic/intern/abc_object.cc b/source/blender/alembic/intern/abc_object.cc
index ddaa5d3..f6508db 100644
--- a/source/blender/alembic/intern/abc_object.cc
+++ b/source/blender/alembic/intern/abc_object.cc
@@ -39,7 +39,6 @@ extern "C" {
#include "BLI_listbase.h"
#include "BLI_math.h"
-#include "BLI_utildefines.h"
#include "BLI_string.h"
}
More information about the Bf-blender-cvs
mailing list