From: Kim Kulling Date: Thu, 5 Jan 2017 19:23:02 +0000 (+0100) Subject: Blender: add missing constructors. X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dfa3409de9bd8fd9be6c91af0121ac10c9466cc9;p=platform%2Fupstream%2Fassimp.git Blender: add missing constructors. --- diff --git a/code/BlenderScene.h b/code/BlenderScene.h index 04eb4bc..fe6d6e1 100644 --- a/code/BlenderScene.h +++ b/code/BlenderScene.h @@ -616,6 +616,17 @@ struct Object : ElemBase { std::shared_ptr data FAIL; ListBase modifiers; + + Object() + : ElemBase() + , type( Type_EMPTY ) + , parent( nullptr ) + , track() + , proxy() + , proxy_from() + , data() { + // empty + } }; @@ -624,6 +635,14 @@ struct Base : ElemBase { Base* prev WARN; std::shared_ptr next WARN; std::shared_ptr object WARN; + + Base() + : ElemBase() + , next() + , object() { + // empty + // empty + } }; // ------------------------------------------------------------------------------- @@ -635,8 +654,15 @@ struct Scene : ElemBase { std::shared_ptr basact WARN; ListBase base; -}; + Scene() + : ElemBase() + , camera() + , world() + , basact() { + // empty + } +}; // ------------------------------------------------------------------------------- struct Image : ElemBase { @@ -664,6 +690,11 @@ struct Image : ElemBase { short animspeed; short gen_x, gen_y, gen_type; + + Image() + : ElemBase() { + // empty + } }; // ------------------------------------------------------------------------------- @@ -751,6 +782,12 @@ struct Tex : ElemBase { //VoxelData *vd; //char use_nodes; + + Tex() + : ElemBase() { + // empty + } + }; // ------------------------------------------------------------------------------- @@ -839,9 +876,13 @@ struct MTex : ElemBase { //float lifefac, sizefac, ivelfac, pvelfac; //float shadowfac; //float zenupfac, zendownfac, blendfac; -}; - + MTex() + : ElemBase() { + // empty } +}; + +} } #endif diff --git a/test/unit/utObjImportExport.cpp b/test/unit/utObjImportExport.cpp index 4fe731b..c6f597b 100644 --- a/test/unit/utObjImportExport.cpp +++ b/test/unit/utObjImportExport.cpp @@ -218,4 +218,4 @@ TEST_F( utObjImportExport, obj_import_test ) { TEST_F( utObjImportExport, issue1111_no_mat_name_Test ) { const aiScene *scene = m_im->ReadFileFromMemory( ( void* ) ObjModel_Issue1111.c_str(), ObjModel_Issue1111.size(), 0 ); EXPECT_NE( nullptr, scene ); -} \ No newline at end of file +}