Blender Git Commits

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

branches/blender-2.47

Merge from trunk:
Revision: 15620
Revision: 15623

Merged with r15628

More progress with subdividing disps for editing the inbetween levels.

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

branches/blender-2.47

Merge from trunk:
Revision: 15561
Revision: 15562
Revision: 15563
Revision: 15564
Revision: 15570
Revision: 15579
Revision: 15589
Revision: 15590
Revision: 15600 (Only: * missing countall when selecting linked)
Revision: 15602
Revision: 15610
Revision: 15612

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

Apricot: GLSL
=============

* Moved GLSL setting switching functions into the game engine
python API so they work in the blender player, and can do
better state switching.
* Also fixes bug #17331, error compiling with cmake.

* For the makers of test builds: it would be great if builds of
this revision or newer for various platforms could be made
available. We want to release a file to test and benchmark
GLSL on different graphics cards, and we need test builds for
this. Thanks!

Apricot Branch
==============

Fix for bug #17326: normal and tangents in the game engine
were computed different than other parts of Blender, this
makes the game engine use the same code as Blender.

Fix for part of bug #17307: normal maps not working correct
in editmode in some cases.

Fix for bug #17339: a crash on ATI cards in glTexSubImage1D
due to a mistake in the code. A patch to fix this was provided
by Yong Ch, thanks!

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

Apricot Branch
==============

* Made in game switching of GLSL options work. There is still
a one frame flicker that needs to be fixed.
* Added access to the estimated average framerate in the game
engine: GameLogic.getAverageFrameRate().
* Added acces to the blender build info from python:
Blender.Get("buildinfo")
* Various GLSL optimizations to allow more constant folding in
the glsl compiler, use glsl shadow functions to do shadow,
instead of own code, and fix an issue with opengl texture
color range.

Apricot: GLSL
=============

* Added options to disable lights, shaders, shadows, ramps,
nodes and textures other than col/alpha for GLSL, in the
Game menu.
* These have python access too to switch them in game, but
it doesn't work correct yet with display lists enabled.
* Fix issue with light lagging behind, debug stats drawing in
wrong color, and a number of other small fixes.

Some refactoring in multires.

svn merge -r15560:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
Also topology mirror crashed when using smooth + mirror. use eve->hash rather them eve->tmp.l for storing edit vert indices's.

svn merge -r15549:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender
- mainly to fix the free() crash with the file selector

branches/blender-2.47

Bugfix from trunk (patch send by Benoit Bolsee to the ML):

Truncated loop n Ipo Actuator when start frame is not 1.
Parent Actuator did not check if activation was due to positive or
negative event

branches/blender-2.47

Merge from trunk:
Revision: 15521
Revision: 15523
Revision: 15524
Revision: 15527
Revision: 15529
Revision: 15537
Revision: 15543
Revision: 15545
Revision: 15548
Revision: 15553

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

* Turned off multires updates if mode isn't sculptmode
* Changed displacement matrices so that edges of faces deform more smoothly
* Force a displacement update on leaving sculptmode

Removed some more unused code.