diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-24 19:40:52 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-24 19:40:52 +0300 |
| commit | a59d7374ea1ce165604975a807fb6e92f9c1d469 (patch) | |
| tree | c09f8380bc54d3b14732531632eac434a19acb94 /source/blender/collada/collada_utils.h | |
| parent | d0856d1d546a07acf29e3a2ac873fe7dc1d7c61b (diff) | |
Nuke DM out of collada code.
Also, now use out-of-main temp copy of mesh for export, and fixed a
potential memleak (return without freeing temp copy of mesh, tsst).
Diffstat (limited to 'source/blender/collada/collada_utils.h')
| -rw-r--r-- | source/blender/collada/collada_utils.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index de9167efb07..89a5379d3c7 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -51,7 +51,6 @@ extern "C" { #include "BKE_context.h" #include "BKE_object.h" -#include "BKE_DerivedMesh.h" #include "BKE_scene.h" #include "BKE_idprop.h" } @@ -73,7 +72,7 @@ extern int bc_test_parent_loop(Object *par, Object *ob); extern int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space = true); extern Object *bc_add_object(Main *bmain, Scene *scene, ViewLayer *view_layer, int type, const char *name); extern Mesh *bc_get_mesh_copy( - Main *bmain, Depsgraph *depsgraph, Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate); + Depsgraph *depsgraph, Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate); extern Object *bc_get_assigned_armature(Object *ob); extern Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object *ob); |