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:
authorKévin Dietrich <kevin.dietrich@mailoo.org>2016-09-16 10:27:44 +0300
committerKévin Dietrich <kevin.dietrich@mailoo.org>2016-09-16 10:27:44 +0300
commit04bfea0d6747b48cf8e792586cd6df8df0f00dcc (patch)
treef4426f36cbc17bfe92e2c74b37969604eb3b6e1e /source/blender/alembic/intern/abc_exporter.h
parente156abe467bc0e69ffcf1c298ac1d984762ebc8e (diff)
Fix T49369: Blender crashes/closes down application at alembic export of
any object There were a couple of crashes caused by stupid typos in rB631af9f930d2fd2c76751204ff22239aa95f761d and rB78ea06fea4a74181c25254ed72d50d8a743b6954, as well as a shamefull lack of 'testing before committing' which only affect exporting. One crash was due to using RNA_boolean_get instead of RNA_enum_get, the other one was a tricky case of order of deletion happening in the destructors of AbcExporter and ArchiveWriter. Should not affect RC or release.
Diffstat (limited to 'source/blender/alembic/intern/abc_exporter.h')
-rw-r--r--source/blender/alembic/intern/abc_exporter.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h
index b99eb09c788..b0eb8e185d6 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -30,6 +30,7 @@
class AbcObjectWriter;
class AbcTransformWriter;
+class ArchiveWriter;
struct EvaluationContext;
struct Main;
@@ -79,11 +80,12 @@ class AbcExporter {
const char *m_filename;
- Alembic::Abc::OArchive m_archive;
unsigned int m_trans_sampling_index, m_shape_sampling_index;
Scene *m_scene;
+ ArchiveWriter *m_writer;
+
std::map<std::string, AbcTransformWriter *> m_xforms;
std::vector<AbcObjectWriter *> m_shapes;