[Bf-blender-cvs] [922e549c65c] soc-2019-fast-io: [Fast import/export] Fixed small memory leak and apply object transform to mesh

Hugo Sales noreply at git.blender.org
Fri Jun 28 19:03:44 CEST 2019


Commit: 922e549c65c941e27bae2aeb905a7fd4fb1868df
Author: Hugo Sales
Date:   Fri Jun 28 18:03:40 2019 +0100
Branches: soc-2019-fast-io
https://developer.blender.org/rB922e549c65c941e27bae2aeb905a7fd4fb1868df

[Fast import/export] Fixed small memory leak and apply object transform to mesh

===================================================================

M	source/blender/editors/io/intern/common.cpp

===================================================================

diff --git a/source/blender/editors/io/intern/common.cpp b/source/blender/editors/io/intern/common.cpp
index 98c2602b005..2a29da7bc2a 100644
--- a/source/blender/editors/io/intern/common.cpp
+++ b/source/blender/editors/io/intern/common.cpp
@@ -164,6 +164,7 @@ bool get_final_mesh(const ExportSettings *const settings,
                     float (*mat)[4][4] /* out */)
 {
   scale_m4_fl(*mat, settings->global_scale * get_unit_scale(escene));
+  mul_m4_m4m4(*mat, *mat, eob->obmat);
 
   change_orientation(*mat, settings->axis_forward, settings->axis_up);
 
@@ -238,6 +239,8 @@ bool export_end(bContext *UNUSED(C), ExportSettings *const settings)
   G.is_rendering = false;
   BKE_spacedata_draw_locks(false);
   DEG_graph_free(settings->depsgraph);
+  if (settings->format_specific)
+    MEM_freeN(settings->format_specific);
   MEM_freeN(settings);
   return true;
 }



More information about the Bf-blender-cvs mailing list