Merged changes in the trunk up to revision 52815.
[blender-staging.git] / source / blender / editors / space_buttons / buttons_context.c
index 2a5b64cd6ed30334f1852c45bb631fb1fdc69953..91f069d16de16ccd02d728f78142e2972e944302 100644 (file)
@@ -538,6 +538,7 @@ static int buttons_context_path(const bContext *C, ButsContextPath *path, int ma
        switch (mainb) {
                case BCONTEXT_SCENE:
                case BCONTEXT_RENDER:
+               case BCONTEXT_RENDER_LAYER:
                        found = buttons_context_path_scene(path);
                        break;
                case BCONTEXT_WORLD:
@@ -1043,7 +1044,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout)
                        name = RNA_struct_name_get_alloc(ptr, namebuf, sizeof(namebuf), NULL);
 
                        if (name) {
-                               if (!ELEM(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE) && ptr->type == &RNA_Scene)
+                               if (!ELEM3(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE, BCONTEXT_RENDER_LAYER) && ptr->type == &RNA_Scene)
                                        uiItemLDrag(row, ptr, "", icon);  /* save some space */
                                else
                                        uiItemLDrag(row, ptr, name, icon);