[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22673] branches/blender2.5/blender: 2. 5 - 2 Bugfixes

[Joshua Leung]

Revision: 22673
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22673
Author:   aligorith
Date:     2009-08-21 13:04:33 +0200 (Fri, 21 Aug 2009)

Log Message:
-----------
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.

Modified Paths:
--------------
    branches/blender2.5/blender/release/ui/space_time.py
    branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c

Modified: branches/blender2.5/blender/release/ui/space_time.py
===================================================================
--- branches/blender2.5/blender/release/ui/space_time.py	2009-08-21 10:47:27 UTC (rev 22672)
+++ branches/blender2.5/blender/release/ui/space_time.py	2009-08-21 11:04:33 UTC (rev 22673)
@@ -63,7 +63,7 @@
 		layout.itemS()
 		
 		row = layout.row(align=True)
-		row.itemR(scene, "active_keying_set", text="")
+		row.item_pointerR(scene, "active_keying_set", scene, "keying_sets", text="")
 		row.itemO("anim.insert_keyframe", text="", icon="ICON_KEY_HLT")
 		row.itemO("anim.delete_keyframe", text="", icon="ICON_KEY_DEHLT")
 

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c	2009-08-21 10:47:27 UTC (rev 22672)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c	2009-08-21 11:04:33 UTC (rev 22673)
@@ -5023,6 +5023,9 @@
 
 	/* 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);