blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 756 Projects 19 Wiki Activity

Initialize and use the theme for metadata text

This commit is contained in:
Antonis Ryakiotakis 2015-04-21 19:01:09 +02:00
parent 58c511fb01
commit e1ce83f762
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/BKE_blender.h
View File

@ -42,7 +42,7 @@ extern "C" {
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 274
#define BLENDER_SUBVERSION 4
#define BLENDER_SUBVERSION 5
/* Several breakages with 270, e.g. constraint deg vs rad */
#define BLENDER_MINVERSION 270
#define BLENDER_MINSUBVERSION 5

9
source/blender/editors/interface/resources.c
View File

@ -2609,6 +2609,15 @@ void init_userdef_do_versions(void)
cp[3] = 255;
}
}
if (U.versionfile < 274 || (U.versionfile == 274 && U.subversionfile < 5)) {
bTheme *btheme;
for (btheme = U.themes.first; btheme; btheme = btheme->next) {
copy_v4_v4_char(btheme->tima.metadatatext, btheme->tima.text_hi);
copy_v4_v4_char(btheme->tseq.metadatatext, btheme->tseq.text_hi);
}
}
if (U.pixelsize == 0.0f)
U.pixelsize = 1.0f;

4
source/blender/editors/screen/area.c
View File

@ -2197,7 +2197,7 @@ void ED_region_image_metadata_draw(ARegion *ar, ImBuf *ibuf, float zoomx, float
BLF_clipping(fontid, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
BLF_enable(fontid, BLF_CLIPPING);
UI_ThemeColor(TH_TEXT_HI);
UI_ThemeColor(TH_METADATA_TEXT);
metadata_draw_imbuf(ibuf, rect, fontid, true, zoomy);
BLF_disable(fontid, BLF_CLIPPING);
@ -2219,7 +2219,7 @@ void ED_region_image_metadata_draw(ARegion *ar, ImBuf *ibuf, float zoomx, float
BLF_clipping(fontid, rect.xmin, rect.ymin, rect.xmax, rect.ymax);
BLF_enable(fontid, BLF_CLIPPING);
UI_ThemeColor(TH_TEXT_HI);
UI_ThemeColor(TH_METADATA_TEXT);
metadata_draw_imbuf(ibuf, rect, fontid, false, zoomy);
BLF_disable(fontid, BLF_CLIPPING);