forked from bartvdbraak/blender
c8b48e70e6
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. |
||
|---|---|---|
| .. | ||
| blender | ||
| creator | ||
| darwin | ||
| gameengine | ||
| icons | ||
| kernel | ||
| Makefile | ||
| nan_compile.mk | ||
| nan_definitions.mk | ||
| nan_link.mk | ||
| nan_subdirs.mk | ||
| nan_warn.mk | ||
| SConscript | ||