From 4acd96d40555bcb4768ac96020577801144c9152 Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Tue, 23 Jan 2018 20:36:51 +0200 Subject: [PATCH] 3DS: Remove Material default constructor --- code/3DSHelper.h | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/code/3DSHelper.h b/code/3DSHelper.h index d70a6baf7..229d2ae20 100644 --- a/code/3DSHelper.h +++ b/code/3DSHelper.h @@ -370,22 +370,8 @@ struct Texture /** Helper structure representing a 3ds material */ struct Material { - //! Default constructor. Builds a default name for the material - Material() - : mDiffuse ( ai_real( 0.6 ), ai_real( 0.6 ), ai_real( 0.6 ) ) // FIX ... we won't want object to be black - , mSpecularExponent ( ai_real( 0.0 ) ) - , mShininessStrength ( ai_real( 1.0 ) ) - , mShading(Discreet3DS::Gouraud) - , mTransparency ( ai_real( 1.0 ) ) - , mBumpHeight ( ai_real( 1.0 ) ) - , mTwoSided (false) - { - static int iCnt = 0; - - char szTemp[128]; - ai_snprintf(szTemp, 128, "UNNAMED_%i",iCnt++); - mName = szTemp; - } + //! Default constructor has been deleted + Material() = delete; //! Constructor with explicit name