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:
authorGaia Clary <gaia.clary@machinimatrix.org>2016-11-02 16:11:46 +0300
committerGaia Clary <gaia.clary@machinimatrix.org>2016-11-02 16:11:46 +0300
commitdac543856205a68975cb61b80769574b5986da18 (patch)
tree80030c56d17807559719f894728e7131f1a2addd /source/blender/collada
parent630c0559f97d4e9fbdbbd4278ddfbfaa07019165 (diff)
COLLADA: Removed obsolete Export select option 'Both' which created invalid data (duplicate transformation information for nodes)
Diffstat (limited to 'source/blender/collada')
-rw-r--r--source/blender/collada/TransformWriter.cpp5
-rw-r--r--source/blender/collada/collada.h3
2 files changed, 1 insertions, 7 deletions
diff --git a/source/blender/collada/TransformWriter.cpp b/source/blender/collada/TransformWriter.cpp
index b16e2e2b0d3..908111ebae6 100644
--- a/source/blender/collada/TransformWriter.cpp
+++ b/source/blender/collada/TransformWriter.cpp
@@ -113,11 +113,6 @@ void TransformWriter::add_node_transform_ob(COLLADASW::Node& node, Object *ob, B
node.addMatrix("transform",d_obmat);
break;
}
- case BC_TRANSFORMATION_TYPE_BOTH:
- {
- node.addMatrix("transform",d_obmat);
- /* fall-through */
- }
case BC_TRANSFORMATION_TYPE_TRANSROTLOC:
{
float loc[3], rot[3], scale[3];
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h
index 0017c66836a..a4416608584 100644
--- a/source/blender/collada/collada.h
+++ b/source/blender/collada/collada.h
@@ -43,8 +43,7 @@ typedef enum BC_export_mesh_type {
typedef enum BC_export_transformation_type {
BC_TRANSFORMATION_TYPE_MATRIX,
- BC_TRANSFORMATION_TYPE_TRANSROTLOC,
- BC_TRANSFORMATION_TYPE_BOTH
+ BC_TRANSFORMATION_TYPE_TRANSROTLOC
} BC_export_transformation_type;
struct bContext;