Merge branch 'master' into blender2.8
[blender.git] / source / blender / editors / space_view3d / view3d_buttons.c
index 644a695..69e8aa0 100644 (file)
@@ -835,7 +835,7 @@ static void view3d_panel_vgroup(const bContext *C, Panel *pa)
 
                bcol = uiLayoutColumn(pa->layout, true);
                row = uiLayoutRow(bcol, true); /* The filter button row */
-               
+
                RNA_pointer_create(NULL, &RNA_ToolSettings, ts, &tools_ptr);
                uiItemR(row, &tools_ptr, "vertex_group_subset", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
 
@@ -864,7 +864,7 @@ static void view3d_panel_vgroup(const bContext *C, Panel *pa)
                                                UI_but_flag_enable(but, UI_BUT_INACTIVE);
                                        }
                                        xco += x;
-                                       
+
                                        row = uiLayoutRow(split, true);
                                        uiLayoutSetEnabled(row, !locked);