Blender Git Commits

Added displacement subdivision; displacements aren't lost when multires-subdividing now. Subdivision is not yet entirely correct; edges and corners aren't handled correctly, so there is still a visible seam.

svn merge -r15399:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/
manually merged source/gameengine

Force an update of mesh disps before subdividing

branches/blender-2.47

Merge from trunk:
Revision: 15383
Revision: 15390
Revision: 15391
Revision: 15392
Revision: 15398

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

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

branches/blender-2.47

Merge from trunk:
Revision: 15133
Revision: 15135
Revision: 15146
Revision: 15220
Revision: 15362

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

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

branches/blender-2.47

Merge from trunk:
Revision: 15302
Revision: 15310
Revision: 15315
Revision: 15325
Revision: 15331
Revision: 15334

svn merge -r15309:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender/
Note the mail message failed to come through for 15309 which was just a merge from trunk.

Apricot Branch: bug in GLSL code generation for nodes.

Merge with trunk (r15316)

Re-grouped the three sculpt panels.

Fixed going into editmode with unsaved disps.

* 22:51 < ideasman-42> jesterKing, dude you totally over did it :0
- the solution was longer than needed. A simple letter addition (r) would've been enough.

* fix path problems when running .py scripts through menus
- 's were not escaped, confusing execfile()
* small indentation fix in btools.py

Fixed saving/loading of MDisps. This took longer than it should have because of a bug in SDNA, noted in the MDisps struct.

Undo/Redo should work correctly as well.

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

Fixed "exploding" vertices in the base mesh.