Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoshua Leung <aligorith@gmail.com>2009-10-19 08:56:19 +0400
committerJoshua Leung <aligorith@gmail.com>2009-10-19 08:56:19 +0400
commit1a7ec53dc446f417592d077f3b736ad35f72ae2e (patch)
tree96837a1edfa75e2eaae876448a82832f64520a93 /source/blender/editors/space_nla/space_nla.c
parented032e13f230a156bbe95412036c37f5f4a8d4b5 (diff)
Assorted 3D-View Tweaks:
* Paste Flipped Pose in PoseMode should now work. The parameters weren't getting set before * Added a notifier that gets sent when changing layers with scene lock on. For some reason, this doesn't seem to be sending the correct updates though. * Made the tools region no longer overlap the 3D-View. The default .b.blend file still needs to be updated so that this gets reflected.
Diffstat (limited to 'source/blender/editors/space_nla/space_nla.c')
-rw-r--r--source/blender/editors/space_nla/space_nla.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/editors/space_nla/space_nla.c b/source/blender/editors/space_nla/space_nla.c
index 32ff7766690..5f2f75b7b6f 100644
--- a/source/blender/editors/space_nla/space_nla.c
+++ b/source/blender/editors/space_nla/space_nla.c
@@ -47,6 +47,8 @@
#include "BKE_nla.h"
#include "BKE_colortools.h"
#include "BKE_context.h"
+#include "BKE_global.h"
+#include "BKE_main.h"
#include "BKE_screen.h"
#include "BKE_utildefines.h"
@@ -112,6 +114,7 @@ static SpaceLink *nla_new(const bContext *C)
/* allocate DopeSheet data for NLA Editor */
snla->ads= MEM_callocN(sizeof(bDopeSheet), "NlaEdit DopeSheet");
+ snla->ads->source= (ID *)scene;
/* set auto-snapping settings */
snla->autosnap = SACTSNAP_FRAME;
@@ -189,8 +192,10 @@ static void nla_init(struct wmWindowManager *wm, ScrArea *sa)
SpaceNla *snla= (SpaceNla *)sa->spacedata.first;
/* init dopesheet data if non-existant (i.e. for old files) */
- if (snla->ads == NULL)
+ if (snla->ads == NULL) {
snla->ads= MEM_callocN(sizeof(bDopeSheet), "NlaEdit DopeSheet");
+ snla->ads->source= (ID *)G.main->scene.first; // XXX this is bad, but we need this to be set correct
+ }
ED_area_tag_refresh(sa);
}