svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19820:HEAD

Notes:
* Game and sequencer RNA, and sequencer header are now out of date
  a bit after changes in trunk.
* I didn't know how to port these bugfixes, most likely they are
  not needed anymore.
  * Fix "duplicate strip" always increase the user count for ipo.
  * IPO pinning on sequencer strips was lost during Undo.
This commit is contained in:
2009-06-08 20:08:19 +00:00
594 changed files with 28292 additions and 13753 deletions

View File

@@ -34,13 +34,15 @@ effect: constructs a new CErrorValue containing errormessage "Error"
CErrorValue::CErrorValue(STR_String errmsg)
CErrorValue::CErrorValue(const char *errmsg)
/*
pre:
effect: constructs a new CErrorValue containing errormessage errmsg
*/
{
m_strErrorText = "[" + errmsg + "]";
m_strErrorText = "[";
m_strErrorText += errmsg;
m_strErrorText += "]";
SetError(true);
}