Chris Want
c8b48e70e6
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.
2006-01-28 16:35:18 +00:00
..
2006-01-26 22:47:31 +00:00
2006-01-28 16:35:18 +00:00
2006-01-16 16:34:08 +00:00
2006-01-15 17:14:58 +00:00
2005-11-28 05:03:26 +00:00
2005-11-30 08:18:06 +00:00
2005-10-02 17:09:11 +00:00
2005-12-05 01:07:24 +00:00
2005-07-18 03:50:37 +00:00
2006-01-16 17:55:03 +00:00
2006-01-28 16:35:18 +00:00
2005-07-18 03:50:37 +00:00
2005-10-10 18:05:30 +00:00
2005-07-18 03:50:37 +00:00
2005-07-18 03:50:37 +00:00
2005-07-18 03:50:37 +00:00
2006-01-16 17:55:03 +00:00
2005-08-23 22:12:06 +00:00
2005-12-01 04:50:04 +00:00
2005-07-18 03:50:37 +00:00
2005-11-29 01:35:45 +00:00
2005-07-18 03:50:37 +00:00
2006-01-08 18:59:55 +00:00
2006-01-08 18:59:55 +00:00
2005-11-30 20:18:54 +00:00
2005-11-17 19:19:05 +00:00
2005-11-22 17:59:49 +00:00
2005-07-23 13:46:40 +00:00
2005-08-17 14:26:00 +00:00
2005-07-18 03:50:37 +00:00
2005-08-21 15:00:17 +00:00
2005-07-18 03:50:37 +00:00
2005-12-27 15:28:09 +00:00
2005-11-30 08:18:06 +00:00
2005-12-18 13:46:01 +00:00
2005-07-18 03:50:37 +00:00
2006-01-05 19:25:38 +00:00
2005-07-18 03:50:37 +00:00
2005-12-17 04:57:48 +00:00
2005-10-26 16:30:50 +00:00
2006-01-17 06:12:53 +00:00
2005-09-09 01:31:10 +00:00
2006-01-03 16:27:34 +00:00
2005-07-18 03:50:37 +00:00
2005-11-30 08:18:06 +00:00
2005-07-18 03:50:37 +00:00
2005-12-13 14:29:56 +00:00
2005-07-18 03:50:37 +00:00
2005-07-18 03:50:37 +00:00
2005-07-18 03:50:37 +00:00
2006-01-01 16:28:57 +00:00
2005-07-18 03:50:37 +00:00
2005-11-15 21:45:05 +00:00
2005-11-15 21:45:05 +00:00
2006-01-11 19:40:06 +00:00
2005-07-23 13:46:40 +00:00
2006-01-21 06:21:03 +00:00
2005-10-27 19:37:37 +00:00
2005-07-18 03:50:37 +00:00
2005-07-18 03:50:37 +00:00
2005-07-18 03:50:37 +00:00
2005-11-29 05:08:29 +00:00
2005-07-18 03:50:37 +00:00
2006-01-28 16:35:18 +00:00
2006-01-16 16:34:08 +00:00
2006-01-24 17:23:01 +00:00
2005-12-14 18:01:42 +00:00
2005-08-17 14:26:00 +00:00
2006-01-28 16:35:18 +00:00
2005-09-29 07:05:00 +00:00
2005-11-29 05:08:29 +00:00
2005-11-04 20:34:38 +00:00
2005-12-05 19:02:30 +00:00
2005-07-26 13:30:08 +00:00
2006-01-16 17:55:03 +00:00
2006-01-16 16:34:08 +00:00
2005-12-05 19:02:30 +00:00
2005-07-23 13:46:40 +00:00
2005-07-18 03:50:37 +00:00
2004-10-07 19:25:40 +00:00
2005-10-03 22:06:16 +00:00
2005-09-21 19:48:40 +00:00
2006-01-06 01:53:26 +00:00
2005-07-18 03:50:37 +00:00
2005-08-21 15:00:17 +00:00
2005-07-18 03:50:37 +00:00
2006-01-23 22:05:47 +00:00
2005-07-18 03:50:37 +00:00
2005-12-13 14:29:56 +00:00
2005-08-05 17:00:26 +00:00
2005-07-18 03:50:37 +00:00
2005-07-18 03:50:37 +00:00
2005-11-30 08:18:06 +00:00
2005-07-18 03:50:37 +00:00
2005-12-07 05:44:29 +00:00
2005-07-18 03:50:37 +00:00
2005-07-18 03:50:37 +00:00
2005-07-18 03:50:37 +00:00
2006-01-23 22:05:47 +00:00
2005-07-18 03:50:37 +00:00
2005-12-18 20:14:22 +00:00
2005-12-18 20:14:22 +00:00
2006-01-12 01:11:42 +00:00
2005-09-26 15:06:28 +00:00
2006-01-16 02:06:02 +00:00
2005-07-18 03:50:37 +00:00
2006-01-16 03:51:32 +00:00
2005-07-18 03:50:37 +00:00
2005-10-10 18:05:30 +00:00
2005-07-18 03:50:37 +00:00