Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 151 vs 152 for /trunk/Source Code/Core/Resources/ConcreteLoaders/Box3DLoaderImpl.cpp

Diff revisions: vs.
  @@ -4,7 +4,6 @@
4 4
5 5 template<>
6 6 Box3D* ImplResourceLoader<Box3D>::operator()(){
7 -
8 7 F32 size = 1.0f;
9 8 if(!_descriptor.getPropertyListString().empty()){
10 9 size = atof(_descriptor.getPropertyListString().c_str());//<should work
  @@ -12,13 +11,14 @@
12 11
13 12 Box3D* ptr = New Box3D(size);
14 13
15 - if(!ptr) return NULL;
16 - if(!load(ptr,_descriptor.getName())) return NULL;
17 -
18 - if(_descriptor.getFlag()){
19 - ptr->getSceneNodeRenderState().useDefaultMaterial(false);
20 - ptr->setMaterial(NULL);
21 - }
14 + if(!load(ptr,_descriptor.getName())){
15 + SAFE_DELETE(ptr);
16 + }else{
17 + if(_descriptor.getFlag()){
18 + ptr->getSceneNodeRenderState().useDefaultMaterial(false);
19 + ptr->setMaterial(NULL);
20 + }
21 + }
22 22
23 23 return ptr;
24 24 }