Merge branch 'master' into blender2.8

- Undo that changes modes currently asserts,
  since undo is now screen data.

  Most likely we will change how object mode and workspaces work
  since it's not practical/maintainable at the moment.

- Removed view_layer from particle settings
  (wasn't needed and complicated undo).

4 files changed, 75 insertions, 72 deletions

diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index df600feb1fe..b94c6e35823 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -810,7 +810,7 @@ int BLF_height_max(int fontid)
 	FontBLF *font = blf_get(fontid);
 
 	if (font && font->glyph_cache) {
-		return font->glyph_cache->max_glyph_height;
+		return font->glyph_cache->glyph_height_max;
 	}
 
 	return 0;
@@ -821,7 +821,7 @@ float BLF_width_max(int fontid)
 	FontBLF *font = blf_get(fontid);
 
 	if (font && font->glyph_cache) {
-		return font->glyph_cache->max_glyph_width;
+		return font->glyph_cache->glyph_width_max;
 	}
 
 	return 0.0f;
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index b4ee0173010..07e568dd279 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -924,7 +924,7 @@ static void blf_font_wrap_apply(
 			wrap.start = wrap.last[0];
 			i = wrap.last[1];
 			pen_x = 0;
-			pen_y -= font->glyph_cache->max_glyph_height;
+			pen_y -= font->glyph_cache->glyph_height_max;
 			g_prev = NULL;
 			lines += 1;
 			continue;
@@ -1138,7 +1138,7 @@ static void blf_font_fill(FontBLF *font)
 #if BLF_BLUR_ENABLE
 	font->blur = 0;
 #endif
-	font->max_tex_size = -1;
+	font->tex_size_max = -1;
 
 	font->buf_info.fbuf = NULL;
 	font->buf_info.cbuf = NULL;
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index f5a645af5e0..6183b54ebcc 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -148,34 +148,34 @@ GlyphCacheBLF *blf_glyph_cache_new(FontBLF *font)
 	memset(gc->bucket, 0, sizeof(gc->bucket));
 
 	gc->textures = (GLuint *)MEM_mallocN(sizeof(GLuint) * 256, __func__);
-	gc->ntex = 256;
-	gc->cur_tex = BLF_CURTEX_UNSET;
-	gc->x_offs = 0;
-	gc->y_offs = 0;
+	gc->textures_len = 256;
+	gc->texture_current = BLF_TEXTURE_UNSET;
+	gc->offset_x = 0;
+	gc->offset_y = 0;
 	gc->pad = 3;
 
-	gc->num_glyphs = (int)font->face->num_glyphs;
-	gc->rem_glyphs = (int)font->face->num_glyphs;
+	gc->glyphs_len_max = (int)font->face->num_glyphs;
+	gc->glyphs_len_free = (int)font->face->num_glyphs;
 	gc->ascender = ((float)font->face->size->metrics.ascender) / 64.0f;
 	gc->descender = ((float)font->face->size->metrics.descender) / 64.0f;
 
 	if (FT_IS_SCALABLE(font->face)) {
-		gc->max_glyph_width = (int)((float)(font->face->bbox.xMax - font->face->bbox.xMin) *
+		gc->glyph_width_max = (int)((float)(font->face->bbox.xMax - font->face->bbox.xMin) *
 		                            (((float)font->face->size->metrics.x_ppem) /
 		                             ((float)font->face->units_per_EM)));
 
-		gc->max_glyph_height = (int)((float)(font->face->bbox.yMax - font->face->bbox.yMin) *
+		gc->glyph_height_max = (int)((float)(font->face->bbox.yMax - font->face->bbox.yMin) *
 		                             (((float)font->face->size->metrics.y_ppem) /
 		                              ((float)font->face->units_per_EM)));
 	}
 	else {
-		gc->max_glyph_width = (int)(((float)font->face->size->metrics.max_advance) / 64.0f);
-		gc->max_glyph_height = (int)(((float)font->face->size->metrics.height) / 64.0f);
+		gc->glyph_width_max = (int)(((float)font->face->size->metrics.max_advance) / 64.0f);
+		gc->glyph_height_max = (int)(((float)font->face->size->metrics.height) / 64.0f);
 	}
 
 	/* can happen with size 1 fonts */
-	CLAMP_MIN(gc->max_glyph_width, 1);
-	CLAMP_MIN(gc->max_glyph_height, 1);
+	CLAMP_MIN(gc->glyph_width_max, 1);
+	CLAMP_MIN(gc->glyph_height_max, 1);
 
 	gc->p2_width = 0;
 	gc->p2_height = 0;
@@ -205,9 +205,10 @@ void blf_glyph_cache_free(GlyphCacheBLF *gc)
 		}
 	}
 
-	if (gc->cur_tex != BLF_CURTEX_UNSET)
-		glDeleteTextures((int)gc->cur_tex + 1, gc->textures);
-	MEM_freeN((void *)gc->textures);
+	if (gc->texture_current != BLF_TEXTURE_UNSET) {
+		glDeleteTextures((int)gc->texture_current + 1, gc->textures);
+	}
+	MEM_freeN(gc->textures);
 	MEM_freeN(gc);
 }
 
@@ -216,25 +217,27 @@ static void blf_glyph_cache_texture(FontBLF *font, GlyphCacheBLF *gc)
 	int i;
 
 	/* move the index. */
-	gc->cur_tex++;
+	gc->texture_current++;
 
-	if (UNLIKELY(gc->cur_tex >= gc->ntex)) {
-		gc->ntex *= 2;
-		gc->textures = (GLuint *)MEM_reallocN((void *)gc->textures, sizeof(GLuint) * gc->ntex);
+	if (UNLIKELY(gc->texture_current >= gc->textures_len)) {
+		gc->textures_len *= 2;
+		gc->textures = MEM_reallocN((void *)gc->textures, sizeof(GLuint) * gc->textures_len);
 	}
 
-	gc->p2_width = (int)blf_next_p2((unsigned int)((gc->rem_glyphs * gc->max_glyph_width) + (gc->pad * 2)));
-	if (gc->p2_width > font->max_tex_size)
-		gc->p2_width = font->max_tex_size;
+	gc->p2_width = (int)blf_next_p2((unsigned int)((gc->glyphs_len_free * gc->glyph_width_max) + (gc->pad * 2)));
+	if (gc->p2_width > font->tex_size_max) {
+		gc->p2_width = font->tex_size_max;
+	}
 
-	i = (int)((gc->p2_width - (gc->pad * 2)) / gc->max_glyph_width);
-	gc->p2_height = (int)blf_next_p2((unsigned int)(((gc->num_glyphs / i) + 1) * gc->max_glyph_height));
+	i = (int)((gc->p2_width - (gc->pad * 2)) / gc->glyph_width_max);
+	gc->p2_height = (int)blf_next_p2((unsigned int)(((gc->glyphs_len_max / i) + 1) * gc->glyph_height_max));
 
-	if (gc->p2_height > font->max_tex_size)
-		gc->p2_height = font->max_tex_size;
+	if (gc->p2_height > font->tex_size_max) {
+		gc->p2_height = font->tex_size_max;
+	}
 
-	glGenTextures(1, &gc->textures[gc->cur_tex]);
-	glBindTexture(GL_TEXTURE_2D, (font->tex_bind_state = gc->textures[gc->cur_tex]));
+	glGenTextures(1, &gc->textures[gc->texture_current]);
+	glBindTexture(GL_TEXTURE_2D, (font->tex_bind_state = gc->textures[gc->texture_current]));
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
@@ -323,8 +326,8 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c)
 	g = (GlyphBLF *)MEM_callocN(sizeof(GlyphBLF), "blf_glyph_add");
 	g->c = c;
 	g->idx = (FT_UInt)index;
-	g->xoff = -1;
-	g->yoff = -1;
+	g->offset_x = -1;
+	g->offset_y = -1;
 	bitmap = slot->bitmap;
 	g->width = (int)bitmap.width;
 	g->height = (int)bitmap.rows;
@@ -457,38 +460,38 @@ void blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y)
 	if (g->build_tex == 0) {
 		GlyphCacheBLF *gc = font->glyph_cache;
 
-		if (font->max_tex_size == -1)
-			glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&font->max_tex_size);
+		if (font->tex_size_max == -1)
+			glGetIntegerv(GL_MAX_TEXTURE_SIZE, (GLint *)&font->tex_size_max);
 
-		if (gc->cur_tex == BLF_CURTEX_UNSET) {
+		if (gc->texture_current == BLF_TEXTURE_UNSET) {
 			blf_glyph_cache_texture(font, gc);
-			gc->x_offs = gc->pad;
-			gc->y_offs = 0;
+			gc->offset_x = gc->pad;
+			gc->offset_y = 0;
 		}
 
-		if (gc->x_offs > (gc->p2_width - gc->max_glyph_width)) {
-			gc->x_offs = gc->pad;
-			gc->y_offs += gc->max_glyph_height;
+		if (gc->offset_x > (gc->p2_width - gc->glyph_width_max)) {
+			gc->offset_x = gc->pad;
+			gc->offset_y += gc->glyph_height_max;
 
-			if (gc->y_offs > (gc->p2_height - gc->max_glyph_height)) {
-				gc->y_offs = 0;
+			if (gc->offset_y > (gc->p2_height - gc->glyph_height_max)) {
+				gc->offset_y = 0;
 				blf_glyph_cache_texture(font, gc);
 			}
 		}
 
-		g->tex = gc->textures[gc->cur_tex];
-		g->xoff = gc->x_offs;
-		g->yoff = gc->y_offs;
+		g->tex = gc->textures[gc->texture_current];
+		g->offset_x = gc->offset_x;
+		g->offset_y = gc->offset_y;
 
 		/* prevent glTexSubImage2D from failing if the character
 		 * asks for pixels out of bounds, this tends only to happen
 		 * with very small sizes (5px high or less) */
-		if (UNLIKELY((g->xoff + g->width)  > gc->p2_width)) {
-			g->width  -= (g->xoff + g->width)  - gc->p2_width;
+		if (UNLIKELY((g->offset_x + g->width)  > gc->p2_width)) {
+			g->width  -= (g->offset_x + g->width)  - gc->p2_width;
 			BLI_assert(g->width > 0);
 		}
-		if (UNLIKELY((g->yoff + g->height) > gc->p2_height)) {
-			g->height -= (g->yoff + g->height) - gc->p2_height;
+		if (UNLIKELY((g->offset_y + g->height) > gc->p2_height)) {
+			g->height -= (g->offset_y + g->height) - gc->p2_height;
 			BLI_assert(g->height > 0);
 		}
 
@@ -503,21 +506,21 @@ void blf_glyph_render(FontBLF *font, GlyphBLF *g, float x, float y)
 		glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
 
 		glBindTexture(GL_TEXTURE_2D, g->tex);
-		glTexSubImage2D(GL_TEXTURE_2D, 0, g->xoff, g->yoff, g->width, g->height, GL_RED, GL_UNSIGNED_BYTE, g->bitmap);
+		glTexSubImage2D(GL_TEXTURE_2D, 0, g->offset_x, g->offset_y, g->width, g->height, GL_RED, GL_UNSIGNED_BYTE, g->bitmap);
 
 		glPixelStorei(GL_UNPACK_LSB_FIRST, lsb_first);
 		glPixelStorei(GL_UNPACK_ROW_LENGTH, row_length);
 		glPixelStorei(GL_UNPACK_ALIGNMENT, alignment);
 
-		g->uv[0][0] = ((float)g->xoff) / ((float)gc->p2_width);
-		g->uv[0][1] = ((float)g->yoff) / ((float)gc->p2_height);
-		g->uv[1][0] = ((float)(g->xoff + g->width)) / ((float)gc->p2_width);
-		g->uv[1][1] = ((float)(g->yoff + g->height)) / ((float)gc->p2_height);
+		g->uv[0][0] = ((float)g->offset_x) / ((float)gc->p2_width);
+		g->uv[0][1] = ((float)g->offset_y) / ((float)gc->p2_height);
+		g->uv[1][0] = ((float)(g->offset_x + g->width)) / ((float)gc->p2_width);
+		g->uv[1][1] = ((float)(g->offset_y + g->height)) / ((float)gc->p2_height);
 
 		/* update the x offset for the next glyph. */
-		gc->x_offs += (int)BLI_rctf_size_x(&g->box) + gc->pad;
+		gc->offset_x += (int)BLI_rctf_size_x(&g->box) + gc->pad;
 
-		gc->rem_glyphs--;
+		gc->glyphs_len_free--;
 		g->build_tex = 1;
 	}
 
diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h
index a34541f62bf..af2dc8a66e9 100644
--- a/source/blender/blenfont/intern/blf_internal_types.h
+++ b/source/blender/blenfont/intern/blf_internal_types.h
@@ -80,33 +80,33 @@ typedef struct GlyphCacheBLF {
 	unsigned int *textures;
 
 	/* size of the array. */
-	unsigned int ntex;
+	unsigned int textures_len;
 
 	/* and the last texture, aka. the current texture. */
-	unsigned int cur_tex;
+	unsigned int texture_current;
 
 	/* like bftgl, we draw every glyph in a big texture, so this is the
 	 * current position inside the texture.
 	 */
-	int x_offs;
-	int y_offs;
+	int offset_x;
+	int offset_y;
 
 	/* and the space from one to other. */
 	int pad;
 
 	/* and the bigger glyph in the font. */
-	int max_glyph_width;
-	int max_glyph_height;
+	int glyph_width_max;
+	int glyph_height_max;
 
 	/* next two integer power of two, to build the texture. */
 	int p2_width;
 	int p2_height;
 
 	/* number of glyphs in the font. */
-	int num_glyphs;
+	int glyphs_len_max;
 
-	/* number of glyphs that we load here. */
-	int rem_glyphs;
+	/* number of glyphs not yet loaded (decreases every glyph loaded). */
+	int glyphs_len_free;
 
 	/* ascender and descender value. */
 	float ascender;
@@ -135,8 +135,8 @@ typedef struct GlyphBLF {
 	unsigned int tex;
 
 	/* position inside the texture where this glyph is store. */
-	int xoff;
-	int yoff;
+	int offset_x;
+	int offset_y;
 
 	/* Bitmap data, from freetype. Take care that this
 	 * can be NULL.
@@ -159,7 +159,7 @@ typedef struct GlyphBLF {
 	float pos_y;
 
 	/* with value of zero mean that we need build the texture. */
-	short build_tex;
+	char build_tex;
 } GlyphBLF;
 
 typedef struct FontBufInfoBLF {
@@ -240,7 +240,7 @@ typedef struct FontBLF {
 	unsigned int size;
 
 	/* max texture size. */
-	int max_tex_size;
+	int tex_size_max;
 
 	/* cache current OpenGL texture to save calls into the API */
 	unsigned int tex_bind_state;
@@ -284,6 +284,6 @@ typedef struct DirBLF {
 	char *path;
 } DirBLF;
 
-#define BLF_CURTEX_UNSET ((unsigned int)-1)
+#define BLF_TEXTURE_UNSET ((unsigned int)-1)
 
 #endif /* __BLF_INTERNAL_TYPES_H__ */