Sergey Sharybin 0a4f8d0e7f Merging r48755 through r48793 from trunk into soc-2011-tomato

2012-07-10 10:11:54 +00:00

..

blender

Merging r48755 through r48793 from trunk into soc-2011-tomato

2012-07-10 10:11:54 +00:00

blenderplayer

svn merge ^/trunk/blender -r48333:48370

2012-06-28 11:20:19 +00:00

creator

svn merge ^/trunk/blender -r48691:48729

2012-07-08 15:55:58 +00:00

darwin

replace former applescript with an editable one

2011-10-19 19:15:35 +00:00

gameengine

Fix for a crash caused by ReplaceMesh changing an objects physics shape. CcdShapeConstructionInfo::UpdateMesh() would change the CcdShapeConstructionInfo's m_meshObject, but didn't change m_meshShapeMap, which means the CcdShapeConstructionInfo object's destructor would not find it's m_meshObject in the m_meshShapeMap. This leaves some nasty dangling pointers laying around which caused issues if the scene was re-run, or the scene was changed to one that also had the mesh.

2012-07-10 02:05:06 +00:00

icons

set svn end of lines to native

2011-05-09 08:15:38 +00:00

tests

code cleanup: remove mode comments, these were applied very un-evenly across a few files.

2012-05-27 13:22:43 +00:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

SConscript

Scons:

2012-06-30 22:44:36 +00:00