diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-07-10 05:57:55 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-07-10 05:57:55 +0400 |
commit | 0051f1be8ea6e329649d4a476e6c4cb5d1d101ef (patch) | |
tree | b96dd939058d529f88a990876e2ec002ea6a0c8f /source/blender/editors/transform/transform_generics.c | |
parent | d7a7081e633f458d3c68f6ccff5376c0340fe42e (diff) | |
parent | 9241559ab4c223d30a949f2e06c776642b69715c (diff) |
NLA SoC: Merge from 2.5
21330 to 21469
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 9d111f39b6d..3415c266cf1 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -63,7 +63,6 @@ //#include "BIF_editsima.h" //#include "BIF_editparticle.h" //#include "BIF_meshtools.h" -#include "BIF_retopo.h" #include "BKE_action.h" #include "BKE_anim.h" @@ -91,6 +90,7 @@ #include "ED_keyframing.h" #include "ED_markers.h" #include "ED_mesh.h" +#include "ED_retopo.h" #include "ED_space_api.h" #include "ED_uvedit.h" #include "ED_view3d.h" @@ -116,8 +116,6 @@ extern ListBase editelems; -extern TransInfo Trans; /* From transform.c */ - /* ************************** Functions *************************** */ void getViewVector(TransInfo *t, float coord[3], float vec[3]) @@ -1364,9 +1362,12 @@ void calculatePropRatio(TransInfo *t) } } +/* XXX only to make manipulators run now */ TransInfo *BIF_GetTransInfo() { - return NULL; + static struct TransInfo trans; + memset(&trans, 0, sizeof(struct TransInfo)); + return &trans; } float get_drawsize(ARegion *ar, float *co) |