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:
@@ -761,7 +761,10 @@ void calculateCenter(TransInfo *t)
|
||||
projectIntView(t, axis, t->center2d);
|
||||
|
||||
/* rotate only needs correct 2d center, grab needs initgrabz() value */
|
||||
if(t->mode==TFM_TRANSLATION) VECCOPY(t->center, axis);
|
||||
if(t->mode==TFM_TRANSLATION) {
|
||||
VECCOPY(t->center, axis);
|
||||
VECCOPY(t->con.center, t->center);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user