Blender Git Loki

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

Various cleanups and optimizations in the game engine:
* Remove some duplication in the RAS_RenderTools, and sync the blender
and game player versions. Also avoid some opengl state changes.
* Don't make separate materials for triangles and quads, this distinction
was moved to the mesh level. Also don't take some other irrelevant tface
settings into account to avoid making more materials.
* Refactoring of mesh storage, should fix wrong normals on meshes that are
reused. It also allows for joining together nearby meshes for speed, though
that's disabled still because it doesn't work together correct yet with
ome features.
* Added a distinction for game objects to be either culled or set invisible,
previously there was only one flag, which couldn't work correct.
* For parenting to bones, where_is_pose was executed multiple times per
frame, now should be once per armature.
* Fix uninitialized intertia value in the physics system.
* Various warning fixes.
* Removed some conditionals in GLSL and other minor optimizations in the
code. Also cache opengl uniform locations, and fix an invalid memory read.
* Avoid doing some math for GLSL lamps if it is not required.

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

branches/blender-2.47

Merge from trunk:
Revision: 16050

branches/blender-2.47

Merge from trunk:
Revision: 16014
Revision: 16022
Revision: 16024
Revision: 16026
Revision: 16028
Revision: 16036

Only do multires mode in sculptmode if multires is the last modifier on the stack. Otherwise, treat it like a regular modifier.

Multires doesn't update itself outside of sculptmode now, so switching levels is somewhat faster outside of sculptmode.

Cleanup and refactoring. Removed some duplicate code.

branches/blender-2.47

Merge from trunk:
Revision: 14917
Revision: 15926
Revision: 15933
Revision: 15935
Revision: 15937
Revision: 15948
Revision: 15949
Revision: 15952
Revision: 15965
Revision: 15966
Revision: 15969
Revision: 15973
Revision: 15975
Revision: 15978
Revision: 15979
Revision: 15985
Revision: 15995
Revision: 15996

This have big changes because the rev 14917 remove an old script and
also we have update to the collada, flt and dxf script.

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

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

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

Fixed partial redraw sculpting for multires.

Fixed a crash in sculptmode after applying a mulitres modifier.

apricot branch: fix a bug with the export of the second uv layer
to the game engine for GLSL.

apricot branch: svn merge -r15868:HEAD https://svn.blender.org/svnroot/bf-blender/trunk/blender

branches/blender-2.47

Merge from trunk:
Revision: 15916
Revision: 15896
Revision: 15132

branches/blender-2.47

Merge from trunk:
Revision: 15880
Revision: 15893
Revision: 15895
Revision: 15903
Revision: 15909
Revision: 15910

branches/blender-2.47

Merge over the game engine changes from trunk into 2.47. The most
user visible changes are in logic with new sensors, controllers and
actuators, the state system, shape key drivers, dupligroups, and
more. There are also new python fynctions and the alpha sorting
setting. The rest consists of refactoring, fixes and optimizations.

MSVC projectfiles might no be merged over correct, I didn't have a
way to check this.

Merge from trunk:
Revision: 14949
Revision: 14952
Revision: 14960
Revision: 15087
Revision: 15172
Revision: 15182
Revision: 15213
Revision: 15221
Revision: 15227
Revision: 15231
Revision: 15249
Revision: 15260
Revision: 15261
Revision: 15263
Revision: 15264
Revision: 15276
Revision: 15280
Revision: 15291
Revision: 15306
Revision: 15327
Revision: 15333
Revision: 15335
Revision: 15336
Revision: 15345
Revision: 15346
Revision: 15347
Revision: 15348
Revision: 15352
Revision: 15354
Revision: 15359
Revision: 15367
Revision: 15376
Revision: 15377
Revision: 15382
Revision: 15387
Revision: 15388
Revision: 15388
Revision: 15394
Revision: 15395
Revision: 15397
Revision: 15413
Revision: 15420
Revision: 15421
Revision: 15425
Revision: 15431
Revision: 15451
Revision: 15477
Revision: 15486
Revision: 15498
Revision: 15504
Revision: 15517
Revision: 15519
Revision: 15546
Revision: 15547
Revision: 15592
Revision: 15607
Revision: 15611
Revision: 15628
Revision: 15638
Revision: 15639
Revision: 15642
Revision: 15656
Revision: 15660
Revision: 15662
Revision: 15663
Revision: 15668
Revision: 15693
Revision: 15695
Revision: 15702
Revision: 15714
Revision: 15723
Revision: 15760
Revision: 15778
Revision: 15843
Revision: 15855
Revision: 15867
Revision: 15872
Revision: 15873
Revision: 15874
Revision: 15875
Revision: 15882
Revision: 15883
Revision: 15884
Revision: 15886

Fixed the pageup/pagedown sculptmode shortcut keys for switching multires levels.

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

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

Alpha blending and sorting changes, but also include some initial
support for GLSL lamps in dupligroups (only one duplicate works at
the moment).