Merged changes in the trunk up to revision 52690.
[blender.git] / source / blender / editors / space_buttons / space_buttons.c
index c98d213e9492fdf96aab70ebcc1d8cfa6b2e3434..95a5bbdf5c857b886f2b9dc14df54dbe1ed28cb6 100644 (file)
@@ -155,6 +155,8 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar)
                ED_region_panels(C, ar, vertical, "scene", sbuts->mainb);
        else if (sbuts->mainb == BCONTEXT_RENDER)
                ED_region_panels(C, ar, vertical, "render", sbuts->mainb);
+       else if (sbuts->mainb == BCONTEXT_RENDER_LAYER)
+               ED_region_panels(C, ar, vertical, "render_layer", sbuts->mainb);
        else if (sbuts->mainb == BCONTEXT_WORLD)
                ED_region_panels(C, ar, vertical, "world", sbuts->mainb);
        else if (sbuts->mainb == BCONTEXT_OBJECT)
@@ -239,6 +241,7 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
                        switch (wmn->data) {
                                case ND_RENDER_OPTIONS:
                                        buttons_area_redraw(sa, BCONTEXT_RENDER);
+                                       buttons_area_redraw(sa, BCONTEXT_RENDER_LAYER);
                                        break;
                                case ND_FRAME:
                                        /* any buttons area can have animated properties so redraw all */
@@ -375,6 +378,10 @@ static void buttons_area_listener(ScrArea *sa, wmNotifier *wmn)
                        ED_area_tag_redraw(sa);
                        sbuts->preview = 1;
                        break;
+               case NC_LINESTYLE:
+                       ED_area_tag_redraw(sa);
+                       sbuts->preview= 1;
+                       break;
        }
 
        if (wmn->data == ND_KEYS)