used AutoDelete<MaterialCreateInfo> instead of delete operator.
This commit is contained in:
parent
d26eb482e7
commit
cde2d9f86b
@ -98,12 +98,10 @@ private:
|
|||||||
|
|
||||||
bool InitAutoMaterial()
|
bool InitAutoMaterial()
|
||||||
{
|
{
|
||||||
MaterialCreateInfo *mci=mtl::CreateVertexColor2D(CoordinateSystem2D::NDC);
|
AutoDelete<MaterialCreateInfo> mci=mtl::CreateVertexColor2D(CoordinateSystem2D::NDC);
|
||||||
|
|
||||||
material_instance=db->CreateMaterialInstance(mci,&vil_config);
|
material_instance=db->CreateMaterialInstance(mci,&vil_config);
|
||||||
|
|
||||||
delete mci;
|
|
||||||
|
|
||||||
return material_instance;
|
return material_instance;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -45,18 +45,18 @@ private:
|
|||||||
|
|
||||||
bool InitMaterial()
|
bool InitMaterial()
|
||||||
{
|
{
|
||||||
|
AutoDelete<MaterialCreateInfo> mci;
|
||||||
|
|
||||||
#ifdef USE_ZERO2ONE_COORD
|
#ifdef USE_ZERO2ONE_COORD
|
||||||
MaterialCreateInfo *mci=mtl::CreateVertexColor2D(CoordinateSystem2D::ZeroToOne);
|
mci=mtl::CreateVertexColor2D(CoordinateSystem2D::ZeroToOne);
|
||||||
#else
|
#else
|
||||||
MaterialCreateInfo *mci=mtl::CreateVertexColor2D(CoordinateSystem2D::Ortho);
|
mci=mtl::CreateVertexColor2D(CoordinateSystem2D::Ortho);
|
||||||
#endif//USE_ZERO2ONE_COORD
|
#endif//USE_ZERO2ONE_COORD
|
||||||
|
|
||||||
//material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/VertexColor2D"));
|
//material_instance=db->CreateMaterialInstance(OS_TEXT("res/material/VertexColor2D"));
|
||||||
|
|
||||||
material_instance=db->CreateMaterialInstance(mci);
|
material_instance=db->CreateMaterialInstance(mci);
|
||||||
|
|
||||||
delete mci;
|
|
||||||
|
|
||||||
if(!material_instance)
|
if(!material_instance)
|
||||||
return(false);
|
return(false);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user