[Bf-blender-cvs] [6ec01dc] UI-experiments wiggly-widgets: Merge branch 'master' into wiggly-widgets

[Julian Eisel]

Commit: 6ec01dcbf29104a6f323b54f8afb2adfd2163ada
Author: Julian Eisel
Date:   Wed Oct 21 11:32:24 2015 +0200
Branches: UI-experiments wiggly-widgets
https://developer.blender.org/rB6ec01dcbf29104a6f323b54f8afb2adfd2163ada

Merge branch 'master' into wiggly-widgets

===================================================================



===================================================================

diff --cc release/scripts/modules/sys_info.py
index de199b1,c79865d..c0f0463
--- a/release/scripts/modules/sys_info.py
+++ b/release/scripts/modules/sys_info.py
@@@ -165,14 -162,10 +162,13 @@@ def write_sysinfo(op)
          for l in glext:
              output.write("\t%s\n" % l)
  
-         output.write("\nImplementation Dependent OpenGL Limits:\n")
-         output.write(lilies)
+         output.write(title("Implementation Dependent OpenGL Limits"))
          limit = bgl.Buffer(bgl.GL_INT, 1)
 +        limit_fl = bgl.Buffer(bgl.GL_FLOAT, 2)
          bgl.glGetIntegerv(bgl.GL_MAX_TEXTURE_UNITS, limit)
          output.write("Maximum Fixed Function Texture Units:\t%d\n" % limit[0])
 +        bgl.glGetFloatv(bgl.GL_MAX_TEXTURE_UNITS, limit_fl)
 +        output.write("Point Sprite Size Range:\t Max: %f Min: %f\n" % (limit_fl[0], limit_fl[1]))
  
          output.write("\nGLSL:\n")
          if version[0] > '1':
diff --cc source/blender/editors/include/ED_screen.h
index 6c9150c,df3a582..2a7d79c
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@@ -69,11 -69,8 +69,11 @@@ void    ED_region_header_init(struct AR
  void    ED_region_header(const struct bContext *C, struct ARegion *ar);
  void    ED_region_toggle_hidden(struct bContext *C, struct ARegion *ar);
  void    ED_region_info_draw(struct ARegion *ar, const char *text, float fill_color[4], const bool full_redraw);
- void    ED_region_image_metadata_draw(int x, int y, struct ImBuf *ibuf, rctf frame, float zoomx, float zoomy);
+ void    ED_region_image_metadata_draw(int x, int y, struct ImBuf *ibuf, const rctf *frame, float zoomx, float zoomy);
  void    ED_region_grid_draw(struct ARegion *ar, float zoomx, float zoomy);
 +void    ED_region_draw_backdrop_view3d(const struct bContext *C, struct Object *camera, const float alpha,
 +                                       const float width, const float height, const float x, const float y,
 +                                       const float zoomx, const float zoomy, const bool draw_background);
  float	ED_region_blend_factor(struct ARegion *ar);
  void	ED_region_visible_rect(struct ARegion *ar, struct rcti *rect);
  
diff --cc source/blender/editors/screen/area.c
index d8c0f99,574ae57..43b71af
--- a/source/blender/editors/screen/area.c
+++ b/source/blender/editors/screen/area.c
@@@ -2335,47 -2360,6 +2368,47 @@@ void ED_region_grid_draw(ARegion *ar, f
  	glEnd();
  }
  
 +/* uses the viewplane from the given camera and draws it as a backdrop */
 +void ED_region_draw_backdrop_view3d(const bContext *C, struct Object *camera, const float alpha,
 +                                    const float width, const float height, const float x, const float y,
 +                                    const float zoomx, const float zoomy, const bool draw_background)
 +{
 +	Main *bmain = CTX_data_main(C);
 +	Scene *scene = CTX_data_scene(C);
 +	char err_out[256] = "unknown";
 +	struct ImBuf *ibuf;
 +
 +	BKE_scene_update_for_newframe(bmain->eval_ctx, bmain, scene, scene->lay);
 +	ibuf = ED_view3d_draw_offscreen_imbuf_simple(scene, camera, width, height, IB_rect,
 +	                                             OB_SOLID, false, false, false,
- 	                                             R_ADDSKY, NULL, err_out);
++	                                             R_ADDSKY, 0, NULL, NULL, err_out);
 +
 +	if (ibuf == NULL)
 +		return;
 +
 +	glEnable(GL_BLEND);
 +	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 +	glPushMatrix();
 +	glScalef(zoomx, zoomy, 0.0f);
 +	glTranslatef(x, y, 0.0f);
 +
 +	/* draw background */
 +	if (draw_background) {
 +		char col[4];
 +
 +		UI_GetThemeColorType4ubv(TH_HIGH_GRAD, SPACE_VIEW3D, col);
 +		glColor4ub(UNPACK3(col), alpha * 255);
 +		glRectf(0, 0, width, height);
 +	}
 +	/* draw the imbuf itself */
 +	glaDrawImBuf_glsl_ctx(C, ibuf, 0.0f, 0.0f, GL_NEAREST, alpha);
 +
 +	glPopMatrix();
 +	glDisable(GL_BLEND);
 +
 +	IMB_freeImBuf(ibuf);
 +}
 +
  /* If the area has overlapping regions, it returns visible rect for Region *ar */
  /* rect gets returned in local region coordinates */
  void ED_region_visible_rect(ARegion *ar, rcti *rect)
diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
index ba07572,2ae7cdd..17d2208
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@@ -1347,10 -1364,10 +1349,10 @@@ void draw_image_seq(const bContext *C, 
  		IMB_freeImBuf(ibuf);
  
  	if (draw_metadata) {
- 		ED_region_image_metadata_draw(0.0, 0.0, ibuf, v2d->tot, 1.0, 1.0);
+ 		ED_region_image_metadata_draw(0.0, 0.0, ibuf, &v2d->tot, 1.0, 1.0);
  	}
  
 -	if (draw_backdrop) {
 +	if (draw_overdrop) {
  		glPopMatrix();
  		glMatrixMode(GL_PROJECTION);
  		glPopMatrix();
diff --cc source/blender/makesdna/DNA_object_types.h
index 3d3adec,cb39655..5ae82b9
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@@ -257,8 -248,6 +259,8 @@@ typedef struct Object 
  
  	short index;			/* custom index, for renderpasses */
  	unsigned short actdef;	/* current deformation group, note: index starts at 1 */
 +	unsigned short actfmap;	/* current face map, note: index starts at 1 */
- 	unsigned short pad2[3];
++	unsigned short pad3[3];
  	float col[4];			/* object color */
  
  	int gameflag;