svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender...
[blender-staging.git] / source / blender / editors / gpencil / gpencil_buttons.c
index 79fcbb0e49d08e7e616a4ee04f0184e79aa84538..192f5c10d0775e941485674cf56326f63aaf25ff 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
@@ -219,9 +217,11 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl, con
                subcol= uiLayoutColumn(col, 1);
                        uiItemR(subcol, &ptr, "use_onion_skinning", 0, "Onion Skinning", ICON_NONE);
                        uiItemR(subcol, &ptr, "ghost_range_max", 0, "Frames", ICON_NONE); // XXX shorter name here? i.e. GStep
-
-               if(is_v3d) {
-                       uiItemR(subcol, &ptr, "show_x_ray", 0, "X-Ray", ICON_NONE);
+               
+               /* 3d-view specific drawing options */
+               if (is_v3d) {
+                       subcol= uiLayoutColumn(col, 0);
+                               uiItemR(subcol, &ptr, "show_x_ray", 0, "X-Ray", ICON_NONE);
                }
                
        }