diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-04-21 20:01:09 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-04-21 20:01:09 +0300 |
| commit | e1ce83f7629750a5900e0c0e83c6aa2860160aec (patch) | |
| tree | c0313fed0fb1e6747ba3f3e0ed850e51f7e6e445 | |
| parent | 58c511fb0149339b8942bb2124c215fd70219b63 (diff) | |
Initialize and use the theme for metadata text
| -rw-r--r-- | source/blender/blenkernel/BKE_blender.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/resources.c | 9 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 0789335de6a..081553826f4 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -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 diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index b90c1c10093..76985331568 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -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; diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index fff55842f71..63eaf7d0296 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -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); |