Blender Git Loki

Branch Tile:

added the GPL header to all files.

Tile Branch:
* Minor UI tweak to save some space in the node editor properties region.
* Rename RNA "opencl" to "use_opencl", to follow boolean rna-naming conventions.

Tile-branch

removed the strange vector allocations in NodeBase. This stabelize the code a lot.
Next crash was about preview images. In order to do dynamic screen update the data can be lost during drawing. this needs to be fixed by working on copies.

optimized the interface of nodes and operations sockets

New composite engine.

committed in order to start the migration of the nodes.
have some issues with some changes in trunk based on the UI event handlers.
sometimes an exception happens in the malloc of a UI-control.
need to discuss what the issue is.

OpenCL part is disabled right now. will be enabled in a folowing commit.

Jeroen & Monique.
- At Mind -

Initial copy of trunk to the tile branch.
Tile branch will be used for migrating compositor nodes to the new structure.
Integration of the new compositor will follow in different commit

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

Merge fixes from trunk into 2.60a tag:


svn merge ^/trunk/blender
-c41113
-c41117
-c41128
-c41132
-c41134
-c41151
-c41152
-c41175
-c41197
-c41203
-c41211
-c41214
-c41219

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

Fixing spaces to tabs.

Grabbed the properties_game.py from my patched Trunk and attempted to get a better "merge" this time.

Also fixed up some errors from properties_scene.py from some stuff that was added after messing around in that file last time.

for svn merging sake's: rolling back last commit (fix for properties_game). I will commit the correct fix next

Using fully-qualified bpy.types.Panel instead of Panel. This was preventing
all panels from drawing.