[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18964] branches/blender2.5/blender/source /blender: 2.5 Bugfixes:

[Joshua Leung]

Revision: 18964
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18964
Author:   aligorith
Date:     2009-02-14 08:52:25 +0100 (Sat, 14 Feb 2009)

Log Message:
-----------
2.5 Bugfixes:

* Removed unnecessary define for context loop (editable posechannels)

* Fixed crash in animation-channel filtering - missing check for no world animation.

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h
    branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c

Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h	2009-02-14 07:27:12 UTC (rev 18963)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h	2009-02-14 07:52:25 UTC (rev 18964)
@@ -95,7 +95,6 @@
 	CTX_DATA_VISIBLE_BONES,
 	CTX_DATA_EDITABLE_BONES,
 	CTX_DATA_VISIBLE_PCHANS,
-	CTX_DATA_EDITABLE_PCHANS,
 };
 
 typedef int bContextDataMember;

Modified: branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c	2009-02-14 07:27:12 UTC (rev 18963)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_filter.c	2009-02-14 07:52:25 UTC (rev 18964)
@@ -1094,7 +1094,7 @@
 	}
 		
 	/* world */
-	if ((wo) && !(ads->filterflag & ADS_FILTER_NOWOR)) {
+	if ((wo && wo->adt) && !(ads->filterflag & ADS_FILTER_NOWOR)) {
 		/* Animation or Drivers */
 		if ((ads->filterflag & ADS_FILTER_ONLYDRIVERS) == 0) {
 			AnimData *adt= wo->adt;