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:
Brecht Van Lommel
2009-06-08 20:08:19 +00:00
594 changed files with 28292 additions and 13753 deletions

View File

@@ -27,6 +27,11 @@ int getNumTexChannels( Material *mat )
}
BL_Material::BL_Material()
{
Initialize();
}
void BL_Material::Initialize()
{
rgb[0] = 0;
rgb[1] = 0;
@@ -52,7 +57,7 @@ BL_Material::BL_Material()
mode = 0;
material = 0;
tface = 0;
material_index = 0;
materialindex = 0;
amb=0.5f;
num_enabled = 0;
num_users = 1;