-
- Downloads
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.
Showing
- source/Makefile 22 additions, 26 deletionssource/Makefile
- source/blender/blenkernel/BKE_blender.h 1 addition, 1 deletionsource/blender/blenkernel/BKE_blender.h
- source/blender/blenkernel/intern/armature.c 15 additions, 0 deletionssource/blender/blenkernel/intern/armature.c
- source/blender/blenkernel/intern/constraint.c 3 additions, 0 deletionssource/blender/blenkernel/intern/constraint.c
- source/blender/blenkernel/intern/subsurf_ccg.c 4 additions, 1 deletionsource/blender/blenkernel/intern/subsurf_ccg.c
- source/blender/python/BPY_interface.c 2 additions, 1 deletionsource/blender/python/BPY_interface.c
- source/blender/python/SConscript 1 addition, 0 deletionssource/blender/python/SConscript
- source/blender/python/api2_2x/Armature.c 17 additions, 8 deletionssource/blender/python/api2_2x/Armature.c
- source/blender/python/api2_2x/Armature.h 2 additions, 2 deletionssource/blender/python/api2_2x/Armature.h
- source/blender/python/api2_2x/BezTriple.c 6 additions, 26 deletionssource/blender/python/api2_2x/BezTriple.c
- source/blender/python/api2_2x/Bone.c 108 additions, 36 deletionssource/blender/python/api2_2x/Bone.c
- source/blender/python/api2_2x/Bone.h 2 additions, 2 deletionssource/blender/python/api2_2x/Bone.h
- source/blender/python/api2_2x/Key.c 83 additions, 58 deletionssource/blender/python/api2_2x/Key.c
- source/blender/python/api2_2x/Mesh.c 348 additions, 130 deletionssource/blender/python/api2_2x/Mesh.c
- source/blender/python/api2_2x/NLA.c 6 additions, 2 deletionssource/blender/python/api2_2x/NLA.c
- source/blender/python/api2_2x/NLA.h 2 additions, 0 deletionssource/blender/python/api2_2x/NLA.h
- source/blender/python/api2_2x/NMesh.c 35 additions, 51 deletionssource/blender/python/api2_2x/NMesh.c
- source/blender/python/api2_2x/Object.c 34 additions, 6 deletionssource/blender/python/api2_2x/Object.c
- source/blender/python/api2_2x/Pose.c 915 additions, 118 deletionssource/blender/python/api2_2x/Pose.c
- source/blender/python/api2_2x/Pose.h 58 additions, 14 deletionssource/blender/python/api2_2x/Pose.h
Loading
Please register or sign in to comment