diff options
author | Joshua Leung <aligorith@gmail.com> | 2009-08-21 15:04:33 +0400 |
---|---|---|
committer | Joshua Leung <aligorith@gmail.com> | 2009-08-21 15:04:33 +0400 |
commit | df61b5f9fd2d92777a9bd00cb7f5f94b130e8c42 (patch) | |
tree | 08aac237fa6f72d6abda2b8bbb4c497df3a3a3de /source/blender/editors | |
parent | 9125fe55fbe18d0fafdf388ce69f9bd29657da2f (diff) |
2.5 - 2 Bugfixes
* Alt-S in Object Mode would crash. Was caused by modal-keymaps for Pose Mode not being cleared when not in Pose Mode.
Also fixed what appears to have been a copy+paste error for Armature Sketching keymaps.
* Active KeyingSet menu in TimeLine header is now properly editable. Was using the wrong type of layout call to do this.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 55565c83f5e..9fc9bf94cd7 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5023,6 +5023,9 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) /* patch? children objects with a timeoffs change the parents. How to solve! */ /* if( ((int)ob->ctime) != F_(scene->r.cfra)) where_is_object(scene, ob); */ + + /* draw paths... */ + // TODO... /* multiply view with object matrix */ wmMultMatrix(ob->obmat); |