diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 07:24:23 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2009-08-16 07:24:23 +0400 |
| commit | 177956a3a71479c56f437acb8524ad1130ba00e5 (patch) | |
| tree | cc54a8a7581a6005b469557f4b22d343437b82c9 /source/blender/blenkernel | |
| parent | c0718d2d4ab6a5ee51ca6164cfc44256867d8701 (diff) | |
2.5/Posemode:
* Pose mode was already object-localized, but moved the flag from object->flag to object->mode, with all the other modes.
* Updated object mode RNA
* Commented out some dubious use of base->flag with the posemode flag. So far as I could see the value was only being set, not read, so a hopefully safe change.
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/context.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/scene.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index 41cf5122103..9ffd3aa704f 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -687,7 +687,7 @@ char *CTX_data_mode_string(const bContext *C) Object *ob = CTX_data_active_object(C); if(ob) { - if(ob->flag & OB_POSEMODE) return "posemode"; + if(ob->mode & OB_MODE_POSE) return "posemode"; else if(ob->mode & OB_MODE_SCULPT) return "sculpt_mode"; else if(ob->mode & OB_MODE_WEIGHT_PAINT) return "weightpaint"; else if(ob->mode & OB_MODE_VERTEX_PAINT) return "vertexpaint"; diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 8e889859317..71271e77adf 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -493,7 +493,7 @@ void set_scene_bg(Scene *scene) base->flag |= flag; /* not too nice... for recovering objects with lost data */ - if(ob->pose==NULL) base->flag &= ~OB_POSEMODE; + //if(ob->pose==NULL) base->flag &= ~OB_POSEMODE; ob->flag= base->flag; ob->ctime= -1234567.0; /* force ipo to be calculated later */ |