[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33498] trunk/blender/source/blender/ editors/gpencil/gpencil_buttons.c: [#25030] Grease Pencil active_frame_delete() deletes wrong layer

[Campbell Barton]

Revision: 33498
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33498
Author:   campbellbarton
Date:     2010-12-06 06:31:27 +0100 (Mon, 06 Dec 2010)

Log Message:
-----------
[#25030] Grease Pencil active_frame_delete() deletes wrong layer
move buttons to the header since they only operate on the active layer.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c	2010-12-06 04:05:34 UTC (rev 33497)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c	2010-12-06 05:31:27 UTC (rev 33498)
@@ -210,10 +210,6 @@
 			uiItemR(subcol, &ptr, "use_onion_skinning", 0, "Onion Skinning", 0);
 			uiItemR(subcol, &ptr, "ghost_range_max", 0, "Frames", 0); // XXX shorter name here? i.e. GStep
 		
-		/* additional options... */
-		subcol= uiLayoutColumn(col, 1);
-			uiItemO(subcol, "Delete Frame", 0, "GPENCIL_OT_active_frame_delete");
-			uiItemO(subcol, "Convert...", 0, "GPENCIL_OT_convert");
 	}
 } 
 
@@ -242,8 +238,11 @@
 		uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_add", NULL, "GPENCIL_OT_data_unlink"); 
 		
 		/* add new layer button - can be used even when no data, since it can add a new block too */
-		uiItemO(col, NULL, 0, "GPENCIL_OT_layer_add");
-	
+		uiItemO(col, "New Layer", 0, "GPENCIL_OT_layer_add");
+		row= uiLayoutRow(col, 1);
+		uiItemO(row, "Delete Frame", 0, "GPENCIL_OT_active_frame_delete");
+		uiItemO(row, "Convert", 0, "GPENCIL_OT_convert");
+		
 	/* sanity checks... */
 	if (gpd == NULL)
 		return;