diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 14:04:16 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2018-06-07 14:04:16 +0300 |
| commit | 508e34d0bf68c837c3b0ece72faaab809df52506 (patch) | |
| tree | aeeafa9c1b853dacd38056bb5bf825c04863b481 /source/blender/editors/space_outliner | |
| parent | 4e014727f6ed1652fd922ba25ec00b0f9df694f9 (diff) | |
| parent | b3a7a75a266de6765d8c04953c0dabce3c30c359 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/editors/animation/anim_deps.c
source/blender/editors/animation/keyframing.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/pose_edit.c
source/blender/editors/armature/pose_transform.c
source/blender/editors/gpencil/gpencil_convert.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/ED_keyframing.h
source/blender/editors/interface/interface_anim.c
source/blender/editors/space_action/action_edit.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_armature.c
source/blender/makesrna/intern/rna_pose.c
source/blender/python/intern/bpy_rna_anim.c
source/blenderplayer/bad_level_call_stubs/stubs.c
source/gameengine/Converter/KX_BlenderSceneConverter.cpp
Diffstat (limited to 'source/blender/editors/space_outliner')
| -rw-r--r-- | source/blender/editors/space_outliner/outliner_draw.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c index 2a37b391433..f07f7f18d6a 100644 --- a/source/blender/editors/space_outliner/outliner_draw.c +++ b/source/blender/editors/space_outliner/outliner_draw.c @@ -340,7 +340,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) /* restore bone name */ BLI_strncpy(newname, ebone->name, sizeof(ebone->name)); BLI_strncpy(ebone->name, oldname, sizeof(ebone->name)); - ED_armature_bone_rename(obedit->data, oldname, newname); + ED_armature_bone_rename(bmain, obedit->data, oldname, newname); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL); } break; @@ -360,7 +360,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) /* restore bone name */ BLI_strncpy(newname, bone->name, sizeof(bone->name)); BLI_strncpy(bone->name, oldname, sizeof(bone->name)); - ED_armature_bone_rename(arm, oldname, newname); + ED_armature_bone_rename(bmain, arm, oldname, newname); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL); break; } @@ -380,7 +380,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname) /* restore bone name */ BLI_strncpy(newname, pchan->name, sizeof(pchan->name)); BLI_strncpy(pchan->name, oldname, sizeof(pchan->name)); - ED_armature_bone_rename(ob->data, oldname, newname); + ED_armature_bone_rename(bmain, ob->data, oldname, newname); WM_event_add_notifier(C, NC_OBJECT | ND_POSE, NULL); break; } |