Final merge of HEAD (bf-blender) into the orange branch.
authorChris Want <cwant@ualberta.ca>
Sat, 28 Jan 2006 16:35:18 +0000 (16:35 +0000)
committerChris Want <cwant@ualberta.ca>
Sat, 28 Jan 2006 16:35:18 +0000 (16:35 +0000)
commitc8b48e70e626a351dc3d02122ea413d0046e98b7
tree0b4777ce258d751f501ec7ce16c129f01f3d3307
parent45c7b2c5c2bc20296a581e1b6a1cb3908f11732f
parentdb5f7bd8da580d05c31f6fa65bfea8042deac10e
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.
26 files changed:
source/Makefile
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/constraint.c
source/blender/python/SConscript
source/blender/python/api2_2x/Armature.c
source/blender/python/api2_2x/Bone.h
source/blender/python/api2_2x/NLA.c
source/blender/python/api2_2x/Object.c
source/blender/src/buttons_editing.c
source/blender/src/buttons_logic.c
source/blender/src/drawseq.c
source/blender/src/filesel.c
source/blender/src/header_ipo.c
source/blender/src/header_oops.c
source/blender/src/header_script.c
source/blender/src/header_text.c
source/blender/src/header_view3d.c
source/blender/src/interface.c
source/blender/src/interface_draw.c
source/blender/src/renderwin.c
source/blender/src/space.c
source/blender/src/toolbox.c
source/blender/src/transform_generics.c
source/blender/src/view.c
source/nan_compile.mk
source/nan_definitions.mk