diff options
Diffstat (limited to 'source/blender/editors/space_outliner/outliner_draw.c')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 7a1eca0f179..e3baf44bf9c 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -337,7 +337,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) BLI_strncpy(newname, ebone->name, sizeof(ebone->name)); BLI_strncpy(ebone->name, oldname, sizeof(ebone->name)); ED_armature_bone_rename(obedit->data, oldname, newname); - WM_event_add_notifier(C, NC_OBJECT | ND_POSE, OBACT_NEW); + WM_event_add_notifier(C, NC_OBJECT | ND_POSE, OBACT_NEW(sl)); } break; } @@ -350,7 +350,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) /* always make current object active */ tree_element_active(C, scene, sl, soops, te, OL_SETSEL_NORMAL, true); - ob = OBACT_NEW; + ob = OBACT_NEW(sl); /* restore bone name */ BLI_strncpy(newname, bone->name, sizeof(bone->name)); @@ -367,7 +367,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) /* always make current pose-bone active */ tree_element_active(C, scene, sl, soops, te, OL_SETSEL_NORMAL, true); - ob = OBACT_NEW; + ob = OBACT_NEW(sl); BLI_assert(ob->type == OB_ARMATURE); @@ -1217,7 +1217,7 @@ static void outliner_draw_iconrow(bContext *C, uiBlock *block, Scene *scene, Sce /* active blocks get white circle */ if (tselem->type == 0) { if (te->idcode == ID_OB) { - active = (OBACT_NEW == (Object *)tselem->id) ? OL_DRAWSEL_NORMAL : OL_DRAWSEL_NONE; + active = (OBACT_NEW(sl) == (Object *)tselem->id) ? OL_DRAWSEL_NORMAL : OL_DRAWSEL_NONE; } else if (scene->obedit && scene->obedit->data == tselem->id) { active = OL_DRAWSEL_NORMAL; @@ -1323,13 +1323,13 @@ static void outliner_draw_tree_element( else if (te->idcode == ID_OB) { Object *ob = (Object *)tselem->id; - if (ob == OBACT_NEW || (ob->flag & SELECT)) { + if (ob == OBACT_NEW(sl) || (ob->flag & SELECT)) { char col[4] = {0, 0, 0, 0}; /* outliner active ob: always white text, circle color now similar to view3d */ active = OL_DRAWSEL_ACTIVE; - if (ob == OBACT_NEW) { + if (ob == OBACT_NEW(sl)) { if (ob->flag & SELECT) { UI_GetThemeColorType4ubv(TH_ACTIVE, SPACE_VIEW3D, col); col[3] = alpha; |