archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

Browse Source 
Notes:
* Sequence transform strip uses G.scene global, this is commented
  out now, should be fixed.
* Etch-a-ton code was most difficult to merge. The files already in
  2.5 got merged, but no new files were added. Calls to these files
  are commented out with "XXX etch-a-ton". editarmature.c and
  transform_snap.c were complex to merge. Martin, please check?
* Game engine compiles and links again here for scons/make/cmake
  (player still fails to link).
This commit is contained in:
Brecht Van Lommel
2009-03-17 21:44:58 +00:00
parent 1ac0d54fea 28f6d223d0
commit d52400bfbd
555 changed files with 20037 additions and 11815 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/editors/transform/transform_conversions.c
View File

@@ -671,7 +671,7 @@ static void bone_children_clear_transflag(TransInfo *t, ListBase *lb)
{
bone->flag |= BONE_HINGE_CHILD_TRANSFORM;
}
else if (bone->flag & BONE_TRANSFORM && (t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL))
else if (bone->flag & BONE_TRANSFORM && (t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL) && t->around == V3D_LOCAL)
{
bone->flag |= BONE_TRANSFORM_CHILD;
}
@@ -4049,7 +4049,7 @@ static void set_trans_object_base_flags(bContext *C, TransInfo *t)
if(parsel)
{
if (t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL)
if ((t->mode == TFM_ROTATION || t->mode == TFM_TRACKBALL) && t->around == V3D_LOCAL)
{
base->flag |= BA_TRANSFORM_CHILD;
}