[Bf-blender-cvs] [f822d3b] temp_manipulators_core: Merge branch 'master' into temp_manipulators_core

[Julian Eisel]

Commit: f822d3b32f3a770434c4760cadb7ba304a59daf8
Author: Julian Eisel
Date:   Tue Sep 20 00:11:52 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rBf822d3b32f3a770434c4760cadb7ba304a59daf8

Merge branch 'master' into temp_manipulators_core

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



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

diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 0070c87,c11c398..c5a31d4
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -528,12 -527,8 +528,11 @@@ void WM_exit_ext(bContext *C, const boo
  	ANIM_fmodifiers_copybuf_free();
  	ED_gpencil_anim_copybuf_free();
  	ED_gpencil_strokes_copybuf_free();
- 	ED_clipboard_posebuf_free();
  	BKE_node_clipboard_clear();
  
 +	/* free manipulator-maps after freeing blender, so no deleted data get accessed during cleaning up of areas */
 +	wm_manipulatormaptypes_free();
 +
  	BLF_exit();
  
  #ifdef WITH_INTERNATIONAL