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

[Julian Eisel]

Commit: ab34e46b16b5f3c781ef272147727f14ddcc7d96
Author: Julian Eisel
Date:   Thu Nov 19 21:03:05 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rBab34e46b16b5f3c781ef272147727f14ddcc7d96

Merge branch 'master' into wiggly-widgets

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



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

diff --cc source/blender/blenkernel/intern/screen.c
index 6742a1f,139c667..a9fe7db
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@@ -182,8 -179,8 +182,9 @@@ ARegion *BKE_area_region_copy(SpaceTyp
  	BLI_listbase_clear(&newar->panels_category);
  	BLI_listbase_clear(&newar->panels_category_active);
  	BLI_listbase_clear(&newar->ui_lists);
 +	BLI_listbase_clear(&newar->widgetmaps);
  	newar->swinid = 0;
+ 	newar->regiontimer = NULL;
  	
  	/* use optional regiondata callback */
  	if (ar->regiondata) {