Commit 70ba3127 authored by cutealien's avatar cutealien

Merged revision 4534-4578 from 1.8 branch:

- Fix crash in SoftwareDriver2 when Material was EMT_DETAIL_MAP but texture[1] was not set (Thanks for fix by chronologicaldot)
- Fix issue in CAnimatedMeshSceneNode::clone which cause crash. (reported and fixed by luthyr)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4579 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 2e85c10a
...@@ -26,6 +26,11 @@ Changes in 1.9 (not yet released) ...@@ -26,6 +26,11 @@ Changes in 1.9 (not yet released)
-------------------------- --------------------------
Changes in 1.8.1 (not yet released) Changes in 1.8.1 (not yet released)
- Fix crash in SoftwareDriver2 when Material was EMT_DETAIL_MAP but texture[1] was not set (Thanks for fix by chronologicaldot)
- Fix buffer overrun in x-loader (Thanks for fix by Otaka)
- Fix cursor visibility update problem under Windows 8 (Thanks @luthyr for reporting)
- Fix irredit links in loadScene/saveScene docs.
- Fix issue in CAnimatedMeshSceneNode::clone which cause crash. (reported and fixed by luthyr)
- Fix compiling errors for c++ builder (thx @Greatwolf for many patches and @cfanderek for reminding) - Fix compiling errors for c++ builder (thx @Greatwolf for many patches and @cfanderek for reminding)
- Initialized IColladaMeshWriter::GeometryWriting which was uninitialized. - Initialized IColladaMeshWriter::GeometryWriting which was uninitialized.
- Fix linker trouble with irr::core::equalsByUl when compiling Irrlicht as managed code (thx @ Memorial76 for a report + testcase) - Fix linker trouble with irr::core::equalsByUl when compiling Irrlicht as managed code (thx @ Memorial76 for a report + testcase)
......
...@@ -1098,8 +1098,11 @@ ISceneNode* CAnimatedMeshSceneNode::clone(ISceneNode* newParent, ISceneManager* ...@@ -1098,8 +1098,11 @@ ISceneNode* CAnimatedMeshSceneNode::clone(ISceneNode* newParent, ISceneManager*
newNode->Looping = Looping; newNode->Looping = Looping;
newNode->ReadOnlyMaterials = ReadOnlyMaterials; newNode->ReadOnlyMaterials = ReadOnlyMaterials;
newNode->LoopCallBack = LoopCallBack; newNode->LoopCallBack = LoopCallBack;
if (newNode->LoopCallBack)
newNode->LoopCallBack->grab();
newNode->PassCount = PassCount; newNode->PassCount = PassCount;
newNode->Shadow = Shadow; newNode->Shadow = Shadow;
if (newNode->Shadow)
newNode->Shadow->grab(); newNode->Shadow->grab();
newNode->JointChildSceneNodes = JointChildSceneNodes; newNode->JointChildSceneNodes = JointChildSceneNodes;
newNode->PretransitingSave = PretransitingSave; newNode->PretransitingSave = PretransitingSave;
......
...@@ -543,6 +543,7 @@ void CBurningVideoDriver::setCurrentShader() ...@@ -543,6 +543,7 @@ void CBurningVideoDriver::setCurrentShader()
break; break;
case EMT_DETAIL_MAP: case EMT_DETAIL_MAP:
if ( texture1 )
shader = ETR_TEXTURE_GOURAUD_DETAIL_MAP; shader = ETR_TEXTURE_GOURAUD_DETAIL_MAP;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment