Merged changes in the trunk up to revision 52815.

4 files changed, 12 insertions, 7 deletions

diff --git a/source/blender/editors/include/ED_gpencil.h b/source/blender/editors/include/ED_gpencil.h
index 39dd8822267..5cc1ecade3e 100644
--- a/source/blender/editors/include/ED_gpencil.h
+++ b/source/blender/editors/include/ED_gpencil.h
@@ -97,12 +97,13 @@ void  ED_gpencil_select_frame(struct bGPDlayer *gpl, int selx, short select_mode
 void  ED_gplayer_frames_delete(struct bGPDlayer *gpl);
 void  ED_gplayer_frames_duplicate(struct bGPDlayer *gpl);
 
+void  ED_gplayer_snap_frames(struct bGPDlayer *gpl, struct Scene *scene, short mode);
+
 #if 0
 void free_gpcopybuf(void);
 void copy_gpdata(void);
 void paste_gpdata(void);
 
-void snap_gplayer_frames(struct bGPDlayer *gpl, short mode);
 void mirror_gplayer_frames(struct bGPDlayer *gpl, short mode);
 #endif
 
diff --git a/source/blender/editors/include/ED_mask.h b/source/blender/editors/include/ED_mask.h
index 46ed9798d32..6644f59be94 100644
--- a/source/blender/editors/include/ED_mask.h
+++ b/source/blender/editors/include/ED_mask.h
@@ -83,12 +83,13 @@ void  ED_mask_select_frame(struct MaskLayer *masklay, int selx, short select_mod
 void ED_masklayer_frames_delete(struct MaskLayer *masklay);
 void ED_masklayer_frames_duplicate(struct MaskLayer *masklay);
 
+void ED_masklayer_snap_frames(struct MaskLayer *masklay, struct Scene *scene, short mode);
+
 #if 0
 void free_gpcopybuf(void);
 void copy_gpdata(void);
 void paste_gpdata(void);
 
-void snap_masklayer_frames(struct MaskLayer *masklay, short mode);
 void mirror_masklayer_frames(struct MaskLayer *masklay, short mode);
 #endif
 
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 10c585aa802..99f7f0856b3 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -97,7 +97,7 @@ DEF_ICON(PLUGIN)
 	/* various ui */
 DEF_ICON(HELP)
 DEF_ICON(GHOST_ENABLED)
-DEF_ICON(COLOR)
+DEF_ICON(COLOR)  /* see COLOR_RED/GREEN/BLUE */
 DEF_ICON(LINKED)
 DEF_ICON(UNLINKED)
 DEF_ICON(HAND)
@@ -428,9 +428,11 @@ DEF_ICON(CURVE_PATH)
 	DEF_ICON(BLANK646)
 	DEF_ICON(BLANK647)
 	DEF_ICON(BLANK648)
-	DEF_ICON(BLANK649)
-	DEF_ICON(BLANK650)
-	DEF_ICON(BLANK651)
+#endif
+DEF_ICON(COLOR_RED)
+DEF_ICON(COLOR_GREEN)
+DEF_ICON(COLOR_BLUE)
+#ifndef DEF_ICON_BLANK_SKIP
 	DEF_ICON(BLANK652)
 	DEF_ICON(BLANK653)
 	DEF_ICON(BLANK654)
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h
index f5c943fbb87..2dc552d0fce 100644
--- a/source/blender/editors/include/UI_interface.h
+++ b/source/blender/editors/include/UI_interface.h
@@ -542,7 +542,7 @@ typedef struct uiStringInfo {
 /* Note: Expects pointers to uiStringInfo structs as parameters.
  *       Will fill them with translated strings, when possible.
  *       Strings in uiStringInfo must be MEM_freeN'ed by caller. */
-void uiButGetStrInfo(struct bContext *C, uiBut *but, int nbr, ...);
+void uiButGetStrInfo(struct bContext *C, uiBut *but, ...);
 
 /* Edit i18n stuff. */
 /* Name of the main py op from i18n addon. */
@@ -817,6 +817,7 @@ void uiTemplateImage(uiLayout *layout, struct bContext *C, struct PointerRNA *pt
 void uiTemplateImageSettings(uiLayout *layout, struct PointerRNA *imfptr, int color_management);
 void uiTemplateImageLayers(uiLayout *layout, struct bContext *C, struct Image *ima, struct ImageUser *iuser);
 void uiTemplateRunningJobs(uiLayout *layout, struct bContext *C);
+void uiOperatorSearch_But(uiBut *but);
 void uiTemplateOperatorSearch(uiLayout *layout);
 void uiTemplateHeader3D(uiLayout *layout, struct bContext *C);
 void uiTemplateEditModeSelection(uiLayout *layout, struct bContext *C);