Blender Git Loki

Merged revisions 45967-46052 from trunk/blender

Merged revisions 45910-45967 from trunk/blender

Some style clean up on if and for statements to match trunk.

Fixing up UVs when using VBOs in the BGE as well as removing some unnecessary OpenGL commands.

Merged revisions 41228-45910 from trunk/blender

Changing the worldTransform and localTransform python attributes to use BLI_math to simplify the code.

svn merge ^/trunk/blender -r42742:43270

conflicted files I had to fix manually:
--------------------------------------
wm.py
properties_particle.py
properties_game.py
rna_scene.c
KX_BlenderInputDevice.h
BL_BlenderDataConversion.cpp
GPG_Application.cpp
BL_Material.cpp
KX_FontObject.cpp

BGE Font Object - fix for offset
(scaling also has to be taken into account here)

Font Object Multiline fix.
The offset was totally wrong when object had scale[1] != 1

Merge with trunk to r42742

Fixing what physics types the collision mask settings appear on.

Merging revisions 41297-41712(HEAD) from Trunk

part 1: svn merge --non-interactive -r41228:41234 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ --accept=theirs-conflict
(only source this time)
still not trunk, but almost there

svn merge --non-interactive -r40843:41226 https://svn.blender.org/svnroot/bf-blender/trunk/blender

Fixing up dynamic lights a bit to better match behavior in Trunk:
* Removed some arguments and return types for some methods
* Added a forfeit_blenderlight method to allow an inactive light to add it's light to the light pool
* Added a wrapper struct to facilitate forfeiting lights

remove desktop and fullscreen properties. They are both part of playerflag now
also I removed the fullscreen from the DNA completely. I don't think we need doversion that..

svn merge -r40820:40843(HEAD) https://svn.blender.org/svnroot/bf-blender/trunk/blender

svn merge -r40631:40820(HEAD) https://svn.blender.org/svnroot/bf-blender/trunk/blenderk
40790 manually merged.

svn merge 40546-40630(HEAD) + fix wm.py
(moving import os inside the operator to be more trunk-like)

launch blenderplayer from ui not working in OSX fix - by Daniel Stokes and me