[Bf-blender-cvs] [7a3ecab] soc-2013-depsgraph_mt: Merge branch 'master' into soc-2013-depsgraph_mt

[Sergey Sharybin]

Commit: 7a3ecab74b6d0c006ef2c5f30efc933233779ca7
Author: Sergey Sharybin
Date:   Wed Nov 20 23:41:41 2013 +0600
http://developer.blender.org/rB7a3ecab74b6d0c006ef2c5f30efc933233779ca7

Merge branch 'master' into soc-2013-depsgraph_mt

Conflicts:
	release/datafiles/splash.png
	release/scripts/startup/bl_ui/properties_render.py

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



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

diff --cc release/scripts/startup/bl_ui/properties_render.py
index 38b5bb4,5e54287..173df9e
--- a/release/scripts/startup/bl_ui/properties_render.py
+++ b/release/scripts/startup/bl_ui/properties_render.py
@@@ -67,11 -67,12 +67,14 @@@ class RENDER_PT_render(RenderButtonsPan
          row = layout.row(align=True)
          row.operator("render.render", text="Render", icon='RENDER_STILL')
          row.operator("render.render", text="Animation", icon='RENDER_ANIMATION').animation = True
-         row.operator("render.play_rendered_anim", text="Play", icon='PLAY')
+         row.operator("sound.mixdown", text="Audio", icon='PLAY_AUDIO')
+ 
+         split = layout.split(1 / 3)
+         split.operator("render.play_rendered_anim", text="Play", icon='PLAY')
+         split.prop(rd, "display_mode", text="Display")
  
-         layout.prop(rd, "display_mode", text="Display")
 +        layout.prop(rd, "use_lock_interface")
 +
  
  class RENDER_PT_dimensions(RenderButtonsPanel, Panel):
      bl_label = "Dimensions"
diff --cc source/blender/editors/mesh/editmesh_extrude.c
index a320731,ef300fa..12f0281
--- a/source/blender/editors/mesh/editmesh_extrude.c
+++ b/source/blender/editors/mesh/editmesh_extrude.c
@@@ -376,10 -374,9 +376,9 @@@ static int edbm_extrude_mesh(Scene *sce
  		 * automatically building this data if invalid. Or something.
  		 */
  //		DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
 -		BKE_object_handle_update(scene, obedit);
 +		BKE_object_handle_update(G.main->evaluation_context, scene, obedit);
  
  		/* individual faces? */
- //		BIF_TransformSetUndo("Extrude");
  		if (nr == 2) {
  //			initTransform(TFM_SHRINKFATTEN, CTX_NO_PET|CTX_NO_MIRROR);
  //			Transform();
diff --cc source/blender/editors/render/render_internal.c
index 61b4e7d,71bf672..250c656
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@@ -602,39 -571,8 +602,37 @@@ static void screen_render_cancel(bConte
  
  	/* kill on cancel, because job is using op->reports */
  	WM_jobs_kill_type(wm, scene, WM_JOB_TYPE_RENDER);
- 
- 	return OPERATOR_CANCELLED;
  }
  
 +static void clean_viewport_memory(Main *bmain)
 +{
 +	Object *object;
 +
 +	for (object = bmain->object.first; object; object = object->id.next) {
 +		/* TODO(sergey): Afraid we cannot use BKE_object_free_derived_caches
 +		 *               because it'll free bounding box which could be needed
 +		 *               for texture mapping in render pipeline.
 +		 *
 +		 *               So for now just use a bit of dupicated logic.
 +		 */
 +		/* BKE_object_free_derived_caches(); */
 +
 +		if (object->derivedFinal) {
 +			object->derivedFinal->needsFree = 1;
 +			object->derivedFinal->release(object->derivedFinal);
 +			object->derivedFinal = NULL;
 +		}
 +		if (object->derivedDeform) {
 +			object->derivedDeform->needsFree = 1;
 +			object->derivedDeform->release(object->derivedDeform);
 +			object->derivedDeform = NULL;
 +		}
 +		if (object->curve_cache) {
 +			BKE_displist_free(&object->curve_cache->disp);
 +		}
 +	}
 +}
 +
  /* using context, starts job */
  static int screen_render_invoke(bContext *C, wmOperator *op, const wmEvent *event)
  {