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:
authorCampbell Barton <ideasman42@gmail.com>2018-05-23 15:11:03 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-05-23 15:11:39 +0300
commitc0ac4791341851cc2435c47b96304de38f88120c (patch)
tree6c63a8ea728b0e2028e4ebb6c1fb2d2b4ea66942 /source/blender/editors/space_outliner
parent7c5e174871e83dfe874da491613a65fbf405099e (diff)
Cleanup: shadow variable warning
Diffstat (limited to 'source/blender/editors/space_outliner')
-rw-r--r--source/blender/editors/space_outliner/outliner_draw.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/editors/space_outliner/outliner_draw.c b/source/blender/editors/space_outliner/outliner_draw.c
index dd9eee1f5fb..528282a6467 100644
--- a/source/blender/editors/space_outliner/outliner_draw.c
+++ b/source/blender/editors/space_outliner/outliner_draw.c
@@ -266,8 +266,6 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
{
Main *bmain = CTX_data_main(C);
SpaceOops *soops = CTX_wm_space_outliner(C);
- Scene *scene = CTX_data_scene(C);
- ViewLayer *view_layer = CTX_data_view_layer(C);
Object *obedit = CTX_data_edit_object(C);
BLI_mempool *ts = soops->treestore;
TreeStoreElem *tselem = tsep;
@@ -322,6 +320,7 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
{
bArmature *arm = (bArmature *)tselem->id;
if (arm->edbo) {
+ ViewLayer *view_layer = CTX_data_view_layer(C);
EditBone *ebone = te->directdata;
char newname[sizeof(ebone->name)];
@@ -336,6 +335,8 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
case TSE_BONE:
{
+ ViewLayer *view_layer = CTX_data_view_layer(C);
+ Scene *scene = CTX_data_scene(C);
Bone *bone = te->directdata;
Object *ob;
char newname[sizeof(bone->name)];
@@ -353,6 +354,9 @@ static void namebutton_cb(bContext *C, void *tsep, char *oldname)
}
case TSE_POSE_CHANNEL:
{
+ Scene *scene = CTX_data_scene(C);
+ ViewLayer *view_layer = CTX_data_view_layer(C);
+
bPoseChannel *pchan = te->directdata;
Object *ob;
char newname[sizeof(pchan->name)];