diff options
Diffstat (limited to 'source/blender/editors/gpencil')
-rw-r--r-- | source/blender/editors/gpencil/Makefile | 2 | ||||
-rw-r--r-- | source/blender/editors/gpencil/drawgpencil.c | 3 | ||||
-rw-r--r-- | source/blender/editors/gpencil/editaction_gpencil.c | 14 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_buttons.c | 16 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 8 | ||||
-rw-r--r-- | source/blender/editors/gpencil/gpencil_paint.c | 2 |
6 files changed, 9 insertions, 36 deletions
diff --git a/source/blender/editors/gpencil/Makefile b/source/blender/editors/gpencil/Makefile index 9bc5f491a83..f3e781a0369 100644 --- a/source/blender/editors/gpencil/Makefile +++ b/source/blender/editors/gpencil/Makefile @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2007 Blender Foundation # All rights reserved. diff --git a/source/blender/editors/gpencil/drawgpencil.c b/source/blender/editors/gpencil/drawgpencil.c index 2b26f4a295d..284dac7a0ae 100644 --- a/source/blender/editors/gpencil/drawgpencil.c +++ b/source/blender/editors/gpencil/drawgpencil.c @@ -32,7 +32,6 @@ #include <math.h> #include <float.h> -#include "MEM_guardedalloc.h" #include "IMB_imbuf_types.h" @@ -44,11 +43,9 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" -#include "BKE_blender.h" #include "BKE_context.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_sequencer.h" #include "BKE_utildefines.h" diff --git a/source/blender/editors/gpencil/editaction_gpencil.c b/source/blender/editors/gpencil/editaction_gpencil.c index dff0839b5bd..d76e5fcf17c 100644 --- a/source/blender/editors/gpencil/editaction_gpencil.c +++ b/source/blender/editors/gpencil/editaction_gpencil.c @@ -31,23 +31,9 @@ #include <stddef.h> #include <math.h> -#include "MEM_guardedalloc.h" - #include "BLI_math.h" #include "BLI_blenlib.h" - -#include "BKE_global.h" -#include "BKE_utildefines.h" -#include "BKE_blender.h" -#include "BKE_fcurve.h" -#include "BKE_gpencil.h" - -#include "BIF_gl.h" -#include "BIF_glutil.h" - - - #include "gpencil_intern.h" #if 0 // XXX disabled until grease pencil code stabilises again diff --git a/source/blender/editors/gpencil/gpencil_buttons.c b/source/blender/editors/gpencil/gpencil_buttons.c index 17bafa3d399..87a9c3cd52f 100644 --- a/source/blender/editors/gpencil/gpencil_buttons.c +++ b/source/blender/editors/gpencil/gpencil_buttons.c @@ -30,7 +30,6 @@ #include <stdlib.h> #include <stddef.h> -#include "MEM_guardedalloc.h" #include "BLI_math.h" #include "BLI_blenlib.h" @@ -41,15 +40,12 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_utildefines.h" #include "WM_api.h" #include "WM_types.h" #include "RNA_access.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "ED_gpencil.h" @@ -126,7 +122,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) /* locked */ icon= (gpl->flag & GP_LAYER_LOCKED) ? ICON_LOCKED : ICON_UNLOCKED; - uiItemR(subrow, &ptr, "locked", 0, "", icon); + uiItemR(subrow, &ptr, "lock", 0, "", icon); /* when layer is locked or hidden, only draw header */ if (gpl->flag & (GP_LAYER_LOCKED|GP_LAYER_HIDE)) { @@ -164,7 +160,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) /* frame locking */ // TODO: this needs its own icons... icon= (gpl->flag & GP_LAYER_FRAMELOCK) ? ICON_RENDER_STILL : ICON_RENDER_ANIMATION; - uiItemR(subrow, &ptr, "frame_lock", 0, "", icon); + uiItemR(subrow, &ptr, "lock_frame", 0, "", icon); uiBlockSetEmboss(block, UI_EMBOSS); @@ -194,11 +190,11 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) /* color */ subcol= uiLayoutColumn(col, 1); uiItemR(subcol, &ptr, "color", 0, "", 0); - uiItemR(subcol, &ptr, "opacity", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(subcol, &ptr, "alpha", UI_ITEM_R_SLIDER, NULL, 0); /* stroke thickness */ subcol= uiLayoutColumn(col, 1); - uiItemR(subcol, &ptr, "line_thickness", UI_ITEM_R_SLIDER, NULL, 0); + uiItemR(subcol, &ptr, "line_width", UI_ITEM_R_SLIDER, NULL, 0); /* debugging options */ if (G.f & G_DEBUG) { @@ -212,7 +208,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl) /* onion-skinning */ subcol= uiLayoutColumn(col, 1); uiItemR(subcol, &ptr, "use_onion_skinning", 0, "Onion Skinning", 0); - uiItemR(subcol, &ptr, "max_ghost_range", 0, "Frames", 0); // XXX shorter name here? i.e. GStep + uiItemR(subcol, &ptr, "ghost_range_max", 0, "Frames", 0); // XXX shorter name here? i.e. GStep /* additional options... */ subcol= uiLayoutColumn(col, 1); @@ -243,7 +239,7 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi col= uiLayoutColumn(layout, 0); /* 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", NULL); + 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"); diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index c487c0469ba..e0d257ca3bf 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -45,21 +45,15 @@ #include "DNA_screen_types.h" #include "DNA_space_types.h" #include "DNA_view3d_types.h" +#include "DNA_gpencil_types.h" -#include "BKE_armature.h" -#include "BKE_blender.h" #include "BKE_context.h" #include "BKE_curve.h" -#include "BKE_global.h" #include "BKE_gpencil.h" -#include "BKE_image.h" #include "BKE_library.h" #include "BKE_object.h" #include "BKE_report.h" -#include "BKE_utildefines.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" #include "WM_api.h" #include "WM_types.h" diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index b52297a319c..cfa7af99d2a 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -40,10 +40,10 @@ #include "BKE_context.h" #include "BKE_global.h" #include "BKE_report.h" -#include "BKE_utildefines.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" +#include "DNA_gpencil_types.h" #include "UI_view2d.h" |