[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47738] trunk/blender/source/blender/ editors/gpencil/gpencil_buttons.c: Fixed issue with disappearing Clip/ Track menu from GP panel in Clip Editor
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jun 11 13:40:41 CEST 2012
Revision: 47738
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47738
Author: nazgul
Date: 2012-06-11 11:40:36 +0000 (Mon, 11 Jun 2012)
Log Message:
-----------
Fixed issue with disappearing Clip/Track menu from GP panel in Clip Editor
caused by switching to Track GP without having active track.
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 2012-06-11 11:11:11 UTC (rev 47737)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c 2012-06-11 11:40:36 UTC (rev 47738)
@@ -231,6 +231,23 @@
STROKE_OPTS_V3D_ON,
} eGP_Stroke_Ops;
+static void draw_gpencil_space_specials(const bContext *C, uiLayout *layout)
+{
+ uiLayout *col, *row;
+ SpaceClip *sc = CTX_wm_space_clip(C);
+
+ col = uiLayoutColumn(layout, 0);
+
+ if (sc) {
+ bScreen *screen = CTX_wm_screen(C);
+ PointerRNA sc_ptr;
+
+ RNA_pointer_create(&screen->id, &RNA_SpaceClipEditor, sc, &sc_ptr);
+ row = uiLayoutRow(col, 1);
+ uiItemR(row, &sc_ptr, "grease_pencil_source", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
+ }
+}
+
/* Draw the contents for a grease-pencil panel*/
static void draw_gpencil_panel(bContext *C, uiLayout *layout, bGPdata *gpd, PointerRNA *ctx_ptr)
{
@@ -247,15 +264,6 @@
/* draw gpd settings first ------------------------------------- */
col = uiLayoutColumn(layout, 0);
- if (sc) {
- bScreen *screen = CTX_wm_screen(C);
- PointerRNA sc_ptr;
-
- RNA_pointer_create(&screen->id, &RNA_SpaceClipEditor, sc, &sc_ptr);
- row = uiLayoutRow(col, 1);
- uiItemR(row, &sc_ptr, "grease_pencil_source", UI_ITEM_R_EXPAND, NULL, ICON_NONE);
- }
-
/* current Grease Pencil block */
/* TODO: show some info about who owns this? */
uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_add", NULL, "GPENCIL_OT_data_unlink");
@@ -315,6 +323,8 @@
/* if (v3d->flag2 & V3D_DISPGP)... etc. */
+ draw_gpencil_space_specials(C, pa->layout);
+
/* get pointer to Grease Pencil Data */
gpd_ptr = gpencil_data_get_pointers((bContext *)C, &ptr);
More information about the Bf-blender-cvs
mailing list