Commit 3c45d6f4 authored by hybrid's avatar hybrid

Merge with 1..4 branch revisions 1444:1475, namely the irrMap bug and changes.txt updates.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1476 dfc29bdd-3216-0410-991c-e03cc46cb475
parent 696baaa7
...@@ -184,6 +184,27 @@ Changes in version 1.5 (... 2008) ...@@ -184,6 +184,27 @@ Changes in version 1.5 (... 2008)
- Finally added StarSonata patch with table element and TabControl additions. Table is based on MultiColor listbox by Acki, and has loads of changes by CuteAlien. - Finally added StarSonata patch with table element and TabControl additions. Table is based on MultiColor listbox by Acki, and has loads of changes by CuteAlien.
- EditBox didn't draw children. - EditBox didn't draw children.
-------------------------------------------
Changes in version 1.4.2 (x.x.2008)
- irrMap fix to make root node always black, by rogerborg.
- Possible core dump fixed in particle system node, by CuteAlien.
- Mem leak fixed in b3d loader.
- Avoid double rendering of child nodes of joints.
- Support for d3d draw2dimage clipping by CuteAlien.
- Fixed an animation transition bug, pointed out by wuallen.
- Fixed the major problem with OpenGL drivers, that claim to be 2.x compatible, but don't offer NPOT support (well, they do, but only in sw rendering...). Now we check for the extension string only.
- Fixed .obj loader bug which inserted vertices in wrong buffers.
- Fixed minor mem leak in Linux device.
------------------------------------------- -------------------------------------------
Changes in version 1.4.1 (04 Jun 2008) Changes in version 1.4.1 (04 Jun 2008)
......
...@@ -810,7 +810,7 @@ class map ...@@ -810,7 +810,7 @@ class map
//------------------------------ //------------------------------
//! operator [] for access to elements //! operator [] for access to elements
//! for example myMap["key"] /** for example myMap["key"] */
AccessClass operator[](const KeyType& k) AccessClass operator[](const KeyType& k)
{ {
return AccessClass(*this, k); return AccessClass(*this, k);
...@@ -820,21 +820,29 @@ class map ...@@ -820,21 +820,29 @@ class map
//------------------------------ //------------------------------
// Disabled methods // Disabled methods
//------------------------------ //------------------------------
//! Copy constructor and assignment operator deliberately // Copy constructor and assignment operator deliberately
//! defined but not implemented. The tree should never be // defined but not implemented. The tree should never be
//! copied, pass along references to it instead. // copied, pass along references to it instead.
explicit map(const map& src); explicit map(const map& src);
map& operator = (const map& src); map& operator = (const map& src);
//! Set node as new root.
/** The node will be set to black, otherwise core dumps may arise
(patch provided by rogerborg).
\param newRoot Node which will be the new root
*/
void setRoot(Node* newRoot) void setRoot(Node* newRoot)
{ {
Root = newRoot; Root = newRoot;
if (Root != 0) if (Root != 0)
{
Root->setParent(0); Root->setParent(0);
Root->setBlack();
}
} }
//! Insert a node into the tree without using any fancy balancing logic. //! Insert a node into the tree without using any fancy balancing logic.
//! Returns false if that key already exist in the tree. /** \return false if that key already exist in the tree. */
bool insert(Node* newNode) bool insert(Node* newNode)
{ {
bool result=true; // Assume success bool result=true; // Assume success
......
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