[Bf-blender-cvs] [a6a21c1] alembic_basic_io: Delete objects when cancelling an import.
Kévin Dietrich
noreply at git.blender.org
Tue Jul 19 15:47:53 CEST 2016
Commit: a6a21c1d92b56212e5b297de9d9b2d6faa12b526
Author: Kévin Dietrich
Date: Mon Jul 18 17:57:47 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rBa6a21c1d92b56212e5b297de9d9b2d6faa12b526
Delete objects when cancelling an import.
===================================================================
M source/blender/alembic/intern/abc_camera.cc
M source/blender/alembic/intern/abc_camera.h
M source/blender/alembic/intern/abc_curves.cc
M source/blender/alembic/intern/abc_curves.h
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/abc_mesh.h
M source/blender/alembic/intern/abc_nurbs.cc
M source/blender/alembic/intern/abc_nurbs.h
M source/blender/alembic/intern/abc_object.h
M source/blender/alembic/intern/abc_points.cc
M source/blender/alembic/intern/abc_points.h
M source/blender/alembic/intern/abc_transform.cc
M source/blender/alembic/intern/abc_transform.h
M source/blender/alembic/intern/alembic_capi.cc
===================================================================
diff --git a/source/blender/alembic/intern/abc_camera.cc b/source/blender/alembic/intern/abc_camera.cc
index dcd4788..38a6d3d 100644
--- a/source/blender/alembic/intern/abc_camera.cc
+++ b/source/blender/alembic/intern/abc_camera.cc
@@ -117,7 +117,7 @@ bool AbcCameraReader::valid() const
return m_schema.valid();
}
-void AbcCameraReader::readObjectData(Main *bmain, Scene *scene, float time)
+void AbcCameraReader::readObjectData(Main *bmain, float time)
{
Camera *bcam = static_cast<Camera *>(BKE_camera_add(bmain, "abc_camera"));
@@ -157,6 +157,6 @@ void AbcCameraReader::readObjectData(Main *bmain, Scene *scene, float time)
BLI_strncpy(bcam->id.name + 2, m_data_name.c_str(), m_data_name.size() + 1);
- m_object = BKE_object_add(bmain, scene, OB_CAMERA, m_object_name.c_str());
+ m_object = BKE_object_add_only_object(bmain, OB_CAMERA, m_object_name.c_str());
m_object->data = bcam;
}
diff --git a/source/blender/alembic/intern/abc_camera.h b/source/blender/alembic/intern/abc_camera.h
index 046420f..7ffda7f 100644
--- a/source/blender/alembic/intern/abc_camera.h
+++ b/source/blender/alembic/intern/abc_camera.h
@@ -54,5 +54,5 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time);
+ void readObjectData(Main *bmain, float time);
};
diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc
index 63933c2..58752d7 100644
--- a/source/blender/alembic/intern/abc_curves.cc
+++ b/source/blender/alembic/intern/abc_curves.cc
@@ -196,14 +196,14 @@ bool AbcCurveReader::valid() const
return m_curves_schema.valid();
}
-void AbcCurveReader::readObjectData(Main *bmain, Scene *scene, float time)
+void AbcCurveReader::readObjectData(Main *bmain, float time)
{
Curve *cu = BKE_curve_add(bmain, m_data_name.c_str(), OB_CURVE);
cu->flag |= CU_DEFORM_FILL | CU_3D;
cu->actvert = CU_ACT_NONE;
- m_object = BKE_object_add(bmain, scene, OB_CURVE, m_object_name.c_str());
+ m_object = BKE_object_add_only_object(bmain, OB_CURVE, m_object_name.c_str());
m_object->data = cu;
read_curve_sample(cu, m_curves_schema, time);
diff --git a/source/blender/alembic/intern/abc_curves.h b/source/blender/alembic/intern/abc_curves.h
index 382ded4..2d039b2 100644
--- a/source/blender/alembic/intern/abc_curves.h
+++ b/source/blender/alembic/intern/abc_curves.h
@@ -54,7 +54,7 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time);
+ void readObjectData(Main *bmain, float time);
};
/* ************************************************************************** */
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index f6e6a95..e4227e5 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -979,11 +979,11 @@ bool AbcMeshReader::valid() const
return m_schema.valid();
}
-void AbcMeshReader::readObjectData(Main *bmain, Scene *scene, float time)
+void AbcMeshReader::readObjectData(Main *bmain, float time)
{
Mesh *mesh = BKE_mesh_add(bmain, m_data_name.c_str());
- m_object = BKE_object_add(bmain, scene, OB_MESH, m_object_name.c_str());
+ m_object = BKE_object_add_only_object(bmain, OB_MESH, m_object_name.c_str());
m_object->data = mesh;
const ISampleSelector sample_sel(time);
@@ -1113,11 +1113,11 @@ bool AbcSubDReader::valid() const
return m_schema.valid();
}
-void AbcSubDReader::readObjectData(Main *bmain, Scene *scene, float time)
+void AbcSubDReader::readObjectData(Main *bmain, float time)
{
Mesh *mesh = BKE_mesh_add(bmain, m_data_name.c_str());
- m_object = BKE_object_add(bmain, scene, OB_MESH, m_object_name.c_str());
+ m_object = BKE_object_add_only_object(bmain, OB_MESH, m_object_name.c_str());
m_object->data = mesh;
const ISampleSelector sample_sel(time);
diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h
index dfe3c2d..f35c714 100644
--- a/source/blender/alembic/intern/abc_mesh.h
+++ b/source/blender/alembic/intern/abc_mesh.h
@@ -101,7 +101,7 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time);
+ void readObjectData(Main *bmain, float time);
private:
void readFaceSetsSample(Main *bmain, Mesh *mesh, size_t poly_start,
@@ -124,7 +124,7 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time);
+ void readObjectData(Main *bmain, float time);
};
void read_subd_sample(const Alembic::AbcGeom::ISubDSchema &schema,
diff --git a/source/blender/alembic/intern/abc_nurbs.cc b/source/blender/alembic/intern/abc_nurbs.cc
index 7f73398..a3c18ad 100644
--- a/source/blender/alembic/intern/abc_nurbs.cc
+++ b/source/blender/alembic/intern/abc_nurbs.cc
@@ -239,7 +239,7 @@ static bool set_knots(const FloatArraySamplePtr &knots, float *&nu_knots)
return true;
}
-void AbcNurbsReader::readObjectData(Main *bmain, Scene *scene, float time)
+void AbcNurbsReader::readObjectData(Main *bmain, float time)
{
Curve *cu = static_cast<Curve *>(BKE_curve_add(bmain, "abc_curve", OB_SURF));
cu->actvert = CU_ACT_NONE;
@@ -323,7 +323,7 @@ void AbcNurbsReader::readObjectData(Main *bmain, Scene *scene, float time)
BLI_strncpy(cu->id.name + 2, m_data_name.c_str(), m_data_name.size() + 1);
- m_object = BKE_object_add(bmain, scene, OB_SURF, m_object_name.c_str());
+ m_object = BKE_object_add_only_object(bmain, OB_SURF, m_object_name.c_str());
m_object->data = cu;
}
diff --git a/source/blender/alembic/intern/abc_nurbs.h b/source/blender/alembic/intern/abc_nurbs.h
index adca013..553e15b 100644
--- a/source/blender/alembic/intern/abc_nurbs.h
+++ b/source/blender/alembic/intern/abc_nurbs.h
@@ -53,7 +53,7 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time);
+ void readObjectData(Main *bmain, float time);
private:
void getNurbsPatches(const Alembic::Abc::IObject &obj);
diff --git a/source/blender/alembic/intern/abc_object.h b/source/blender/alembic/intern/abc_object.h
index 0c2e08d..59e8d10 100644
--- a/source/blender/alembic/intern/abc_object.h
+++ b/source/blender/alembic/intern/abc_object.h
@@ -136,7 +136,7 @@ public:
virtual bool valid() const = 0;
- virtual void readObjectData(Main *bmain, Scene *scene, float time) = 0;
+ virtual void readObjectData(Main *bmain, float time) = 0;
void readObjectMatrix(const float time);
diff --git a/source/blender/alembic/intern/abc_points.cc b/source/blender/alembic/intern/abc_points.cc
index f86f5ef..c8b346a 100644
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@ -149,7 +149,7 @@ bool AbcPointsReader::valid() const
return m_schema.valid();
}
-void AbcPointsReader::readObjectData(Main *bmain, Scene *scene, float time)
+void AbcPointsReader::readObjectData(Main *bmain, float time)
{
Mesh *mesh = BKE_mesh_add(bmain, m_data_name.c_str());
@@ -175,7 +175,7 @@ void AbcPointsReader::readObjectData(Main *bmain, Scene *scene, float time)
BKE_mesh_validate(mesh, false, false);
- m_object = BKE_object_add(bmain, scene, OB_MESH, m_object_name.c_str());
+ m_object = BKE_object_add_only_object(bmain, OB_MESH, m_object_name.c_str());
m_object->data = mesh;
if (has_animations(m_schema, m_settings)) {
diff --git a/source/blender/alembic/intern/abc_points.h b/source/blender/alembic/intern/abc_points.h
index a32307f..bb3880f 100644
--- a/source/blender/alembic/intern/abc_points.h
+++ b/source/blender/alembic/intern/abc_points.h
@@ -57,5 +57,5 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time);
+ void readObjectData(Main *bmain, float time);
};
diff --git a/source/blender/alembic/intern/abc_transform.cc b/source/blender/alembic/intern/abc_transform.cc
index 912ff36..3326ae0 100644
--- a/source/blender/alembic/intern/abc_transform.cc
+++ b/source/blender/alembic/intern/abc_transform.cc
@@ -145,7 +145,8 @@ bool AbcEmptyReader::valid() const
return m_schema.valid();
}
-void AbcEmptyReader::readObjectData(Main *bmain, Scene *scene, float /*time*/)
+void AbcEmptyReader::readObjectData(Main *bmain, float /*time*/)
{
- m_object = BKE_object_add(bmain, scene, OB_EMPTY, m_object_name.c_str());
+ m_object = BKE_object_add_only_object(bmain, OB_EMPTY, m_object_name.c_str());
+ m_object->data = NULL;
}
diff --git a/source/blender/alembic/intern/abc_transform.h b/source/blender/alembic/intern/abc_transform.h
index 049b007..ca0e187 100644
--- a/source/blender/alembic/intern/abc_transform.h
+++ b/source/blender/alembic/intern/abc_transform.h
@@ -66,5 +66,5 @@ public:
bool valid() const;
- void readObjectData(Main *bmain, Scene *scene, float time);
+ void readObjectData(Main *bmain, float time);
};
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index a258f07..520cefa 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -545,6 +545,7 @@ struct ImportJobData {
float *progress;
char error_code;
+ bool was_cancelled;
};
ABC_INLINE bool is_mesh_and_strands(const IObject &object)
@@ -618,6 +619,7 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
visit_object(archive->getTop(), data->readers, data->parent_map, data->settings);
if (G.is_break) {
+ data->was_cancelled = true;
return;
}
@@ -629,8 +631,6 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
const float size = static_cast<float>(data->readers.size());
size_t i = 0;
- Scene *scene = data->scene;
-
chrono_t min_time = std::numeric_limits<chrono_t>::max();
chrono_t max_time = std::numeric_limits<chrono_t>::min();
@@ -639,7 +639,7 @@ static void import_startjob(void *user_data, short *stop, short *do_update, floa
AbcObjectReader *reader = *iter;
if (reader->valid()) {
- reader->readObjectData(data->bmain, scene, 0.0f);
+ reader->readObjectData(data->bmain, 0.0f);
reader->readObjectMatrix(0.0f);
min_time = std::min(min_time, reader->minTime());
@@ -649,11 +649,14 @@ static void import_startjob(void *user_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list