Final merge of HEAD (bf-blender) into the orange branch.

Here are my notes on things to look out for as potential problem
spots:

source/blender/blenkernel/intern/displist.c:
+ is initfastshade(void) supposed to be empty? I had
to make it empty to get the merged tree to compile.

source/blender/python/api2_2x/Armature.c:
+ went with the version that had Armature_getLayers()

source/blender/python/api2_2x/Object.c
+ went with the version of Object_getPose() from bf-blender.
(#ifdef 0-ed the other version)

source/blender/python/api2_2x/Pose.[ch]
+ had problems linking due to no Pose_Init() ... copied these
two files straight from bf-blender.

source/blender/src/drawview.c:
+ view3d_panel_properties() had things shifted a few things shifted
a few pixels, otherwise, things were painless

source/blender/src/splash.jpg.c:
+ went with bf-blender version (orange is dead)

source/gameengine:
+ went with bf-blender version -- does not compile due to IMB_rect* stuff,
Ton should look into this.
This commit is contained in:
Chris Want
2006-01-28 16:35:18 +00:00
90 changed files with 5381 additions and 2661 deletions

View File

@@ -1012,9 +1012,16 @@ void BIF_do_render(int anim)
/* if start render in 3d win, use layer from window (e.g also local view) */
if(curarea && curarea->spacetype==SPACE_VIEW3D) {
int lay= G.scene->lay;
if(G.vd->lay & 0xFF000000) // localview
G.scene->lay |= G.vd->lay;
else G.scene->lay= G.vd->lay;
/*
* if view is defined (might not be if called form script), check
* and set layers
*/
if(G.vd) {
if(G.vd->lay & 0xFF000000) // localview
G.scene->lay |= G.vd->lay;
else
G.scene->lay= G.vd->lay;
}
do_render(anim);