[Bf-blender-cvs] [d2d39b5] wiggly-widgets: Merge branch 'master' into wiggly-widgets

Julian Eisel noreply at git.blender.org
Tue Sep 20 00:11:26 CEST 2016


Commit: d2d39b5bcb6fb00ebc497757b4ee945b78baf940
Author: Julian Eisel
Date:   Tue Sep 20 00:10:58 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBd2d39b5bcb6fb00ebc497757b4ee945b78baf940

Merge branch 'master' into wiggly-widgets

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



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

diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 776567f,c11c398..8b2eb9b
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -527,12 -527,8 +527,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




More information about the Bf-blender-cvs mailing list