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

[Sergey Sharybin]

Commit: d547db06b6a1d03464b35f8ae0dc973179674952
Author: Sergey Sharybin
Date:   Tue Dec 10 14:30:59 2013 +0600
http://developer.blender.org/rBd547db06b6a1d03464b35f8ae0dc973179674952

Merge branch 'master' into soc-2013-depsgraph_mt

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



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

diff --cc source/blender/editors/render/render_internal.c
index 250c656,e1a271e..b288fb8
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@@ -737,27 -677,9 +737,27 @@@ static int screen_render_invoke(bContex
  			rj->v3d_override = true;
  
  		if (v3d->localvd)
- 			rj->lay_override = scene->lay | v3d->localvd->lay;
+ 			rj->lay_override |= v3d->localvd->lay;
  	}
  
 +	/* Lock the user interface depending on render settings. */
 +	if (scene->r.use_lock_interface) {
 +		WM_set_locked_interface(CTX_wm_manager(C), true);
 +
 +		/* Set flag interface need to be unlocked.
 +		 *
 +		 * This is so because we don't have copy of render settings
 +		 * accessible from render job and copy is needed in case
 +		 * of non-locked rendering, so we wouldn't try to unlock
 +		 * anything if option was initially unset but then was
 +		 * enabled during rendering.
 +		 */
 +		rj->interface_locked = true;
 +
 +		/* Clean memory used by viewport? */
 +		clean_viewport_memory(rj->main);
 +	}
 +
  	/* setup job */
  	if (RE_seq_render_active(scene, &scene->r)) name = "Sequence Render";
  	else name = "Render";
diff --cc source/blender/windowmanager/WM_api.h
index 42a696f,26294dd..bc0c233
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -418,11 -421,8 +421,11 @@@ void		WM_redraw_windows(struct bContex
  void        WM_main_playanim(int argc, const char **argv);
  
  /* debugging only, convenience function to write on crash */
- int write_crash_blend(void);
+ bool write_crash_blend(void);
  
 +			/* Lock the interface for any communication */
 +void        WM_set_locked_interface(struct wmWindowManager *wm, bool lock);
 +
  #ifdef __cplusplus
  }
  #endif