Joseph Eagar f026266e18 merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that. ...

[[Split portion of a mixed commit.]]

2009-05-23 03:24:15 +00:00

..

BlenderRoutines

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

Converter

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

Expressions

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

GameLogic

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

GamePlayer

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

Ketsji

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

Network

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

Physics

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

PyDoc

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

Rasterizer

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

SceneGraph

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

VideoTexture

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

CMakeLists.txt

VideoTexture module.

2008-10-31 22:35:52 +00:00

Makefile

Makefile fixes for compiling with new videotexture code.

2008-11-02 18:12:45 +00:00

SConscript

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

2009-03-17 21:44:58 +00:00