[Bf-blender-cvs] [1d93038] gooseberry: Merge branch 'master' into gooseberry

[Sergey Sharybin]

Commit: 1d930382e67e4779b3c87ccdd311a043b89ca107
Author: Sergey Sharybin
Date:   Thu Jul 2 16:50:28 2015 +0200
Branches: gooseberry
https://developer.blender.org/rB1d930382e67e4779b3c87ccdd311a043b89ca107

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/makesdna/DNA_object_types.h

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



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

diff --cc source/blender/editors/include/ED_screen.h
index d462b9e,588b046..b6b72ad
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@@ -65,12 -68,9 +68,12 @@@ void    ED_region_panels
  void    ED_region_header_init(struct ARegion *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, int block, float fill_color[4]);
+ 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_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);