[Bf-blender-cvs] [c0ac4791341] blender2.8: Cleanup: shadow variable warning

[Campbell Barton]

Commit: c0ac4791341851cc2435c47b96304de38f88120c
Author: Campbell Barton
Date:   Wed May 23 14:11:03 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc0ac4791341851cc2435c47b96304de38f88120c

Cleanup: shadow variable warning

===================================================================

M       source/blender/editors/space_outliner/outliner_draw.c

===================================================================

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)];

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs