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

[Antony Riakiotakis]

Commit: dc7d07753f537a89068dd770a7b264f8cbbb6d47
Author: Antony Riakiotakis
Date:   Mon May 4 17:34:32 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBdc7d07753f537a89068dd770a7b264f8cbbb6d47

Merge branch 'master' into gooseberry

Conflicts:
	source/blender/editors/space_sequencer/sequencer_draw.c

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



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

diff --cc build_files/build_environment/install_deps.sh
index 56f7206,ea60eb3..ac8fbe3
--- a/build_files/build_environment/install_deps.sh
+++ b/build_files/build_environment/install_deps.sh
@@@ -530,12 -510,9 +530,12 @@@ OSL_SOURCE_REPO_UID="22ee5ea298fd215430
  OSL_SOURCE_REPO_BRANCH="blender-fixes"
  
  OPENCOLLADA_SOURCE=( "https://github.com/KhronosGroup/OpenCOLLADA.git" )
- OPENCOLLADA_REPO_UID="18da7f4109a8eafaa290a33f5550501cc4c8bae8"
+ OPENCOLLADA_REPO_UID="3335ac164e68b2512a40914b14c74db260e6ff7d"
  FFMPEG_SOURCE=( "http://ffmpeg.org/releases/ffmpeg-$FFMPEG_VERSION.tar.bz2" )
  
 +ALEMBIC_SOURCE=( "https://code.google.com/p/alembic/" )
 +ALEMBIC_REPO_UID=( "1_05_05" )
 +
  
  ##### Generic Helpers #####
  
diff --cc intern/cycles/blender/addon/ui.py
index 59107a2,0407e87..5147a10
--- a/intern/cycles/blender/addon/ui.py
+++ b/intern/cycles/blender/addon/ui.py
@@@ -1418,14 -1406,20 +1418,21 @@@ class CyclesScene_PT_simplify(CyclesBut
      def draw(self, context):
          layout = self.layout
  
 -        rd = context.scene.render
 +        scene = context.scene
 +        rd = scene.render
  
          layout.active = rd.use_simplify
+         split = layout.split()
  
-         row = layout.row()
-         row.prop(rd, "simplify_subdivision", text="Subdivision")
-         row.prop(rd, "simplify_child_particles", text="Child Particles")
+         col = split.column()
+         col.label(text="Viewport:")
+         col.prop(rd, "simplify_subdivision", text="Subdivision")
+         col.prop(rd, "simplify_child_particles", text="Child Particles")
+ 
+         col = split.column()
+         col.label(text="Render:")
+         col.prop(rd, "simplify_subdivision_render", text="Subdivision")
+         col.prop(rd, "simplify_child_particles_render", text="Child Particles")
  
  
  def draw_device(self, context):
diff --cc source/blender/editors/include/ED_screen.h
index 5f25221,7f6679b..1b4f3a1
--- a/source/blender/editors/include/ED_screen.h
+++ b/source/blender/editors/include/ED_screen.h
@@@ -66,11 -66,8 +66,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, int block, float fill_color[4]);
- void    ED_region_image_metadata_draw(struct ARegion *ar, struct ImBuf *ibuf, float zoomx, float zoomy);
+ 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);
  
diff --cc source/blender/editors/space_sequencer/sequencer_draw.c
index d612c17,0c811ca..066817d
--- a/source/blender/editors/space_sequencer/sequencer_draw.c
+++ b/source/blender/editors/space_sequencer/sequencer_draw.c
@@@ -1334,18 -1304,30 +1336,21 @@@ void draw_image_seq(const bContext *C, 
  			glTexCoord2f(1.0f, 0.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymin);
  		}
  	}
 -	else if (draw_backdrop) {
 -		float aspect;
 -		float image_aspect = viewrect[0] / viewrect[1];
 -		float imagex, imagey;
 -
 -		aspect = BLI_rcti_size_x(&ar->winrct) / (float)BLI_rcti_size_y(&ar->winrct);
 -
 -		if (aspect >= image_aspect) {
 -			imagex = image_aspect / aspect;
 -			imagey = 1.0f;
 -		}
 -		else {
 -			imagex = 1.0f;
 -			imagey = aspect / image_aspect;
 -		}
 -
 -		glTexCoord2f(0.0f, 0.0f); glVertex2f(-imagex, -imagey);
 -		glTexCoord2f(0.0f, 1.0f); glVertex2f(-imagex, imagey);
 -		glTexCoord2f(1.0f, 1.0f); glVertex2f(imagex, imagey);
 -		glTexCoord2f(1.0f, 0.0f); glVertex2f(imagex, -imagey);
++<<<<<<< HEAD
 +	else if (draw_overdrop) {
 +		float imagex = (scene->r.size * scene->r.xsch) / 200.0f * sseq->overdrop_zoom;
 +		float imagey = (scene->r.size * scene->r.ysch) / 200.0f * sseq->overdrop_zoom;
 +		float xofs = BLI_rcti_size_x(&ar->winrct)/2.0f + sseq->overdrop_offset[0];
 +		float yofs = BLI_rcti_size_y(&ar->winrct)/2.0f + sseq->overdrop_offset[1];
 +		
 +		glTexCoord2f(0.0f, 0.0f); glVertex2f(-imagex + xofs, -imagey + yofs);
 +		glTexCoord2f(0.0f, 1.0f); glVertex2f(-imagex + xofs, imagey + yofs);
 +		glTexCoord2f(1.0f, 1.0f); glVertex2f(imagex + xofs, imagey + yofs);
 +		glTexCoord2f(1.0f, 0.0f); glVertex2f(imagex + xofs, -imagey + yofs);
  	}
  	else {
+ 		draw_metadata = ((sseq->flag & SEQ_SHOW_METADATA) != 0);
+ 
  		glTexCoord2f(0.0f, 0.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymin);
  		glTexCoord2f(0.0f, 1.0f); glVertex2f(v2d->tot.xmin, v2d->tot.ymax);
  		glTexCoord2f(1.0f, 1.0f); glVertex2f(v2d->tot.xmax, v2d->tot.ymax);
@@@ -1368,7 -1350,15 +1373,15 @@@
  	if (!scope)
  		IMB_freeImBuf(ibuf);
  
+ 	if (draw_metadata) {
+ 		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();
+ 		glMatrixMode(GL_MODELVIEW);
  		return;
  	}