[Bf-blender-cvs] [7a9c12d] wiggly-widgets: Merge branch 'temp_manipulators_core' into wiggly-widgets

[Julian Eisel]

Commit: 7a9c12d6121db78bc0ec5f01e23146a150e22f98
Author: Julian Eisel
Date:   Thu Sep 22 01:31:46 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB7a9c12d6121db78bc0ec5f01e23146a150e22f98

Merge branch 'temp_manipulators_core' into wiggly-widgets

Conflicts:
	source/blender/blenkernel/BKE_screen.h
	source/blender/editors/space_api/spacetypes.c
	source/blender/makesdna/DNA_view3d_types.h
	source/blenderplayer/bad_level_call_stubs/stubs.c

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



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

diff --cc source/blender/editors/space_api/spacetypes.c
index 4b5aa61,2b4ca8d..208cf7c
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@@ -121,16 -121,16 +121,19 @@@ void ED_spacetypes_init(void
  	
  	ED_operatortypes_view2d();
  	ED_operatortypes_ui();
- 	
+ 
+ 	/* register types for operators and manipulators */
  	spacetypes = BKE_spacetypes_list();
  	for (type = spacetypes->first; type; type = type->next) {
- 		/* register widgets, operators, dropboxes */
- 		if (type->widgets)
- 			type->widgets();
- 		if (type->operatortypes)
+ 		if (type->operatortypes) {
  			type->operatortypes();
- 		if (type->dropboxes)
+ 		}
+ 		if (type->manipulators) {
+ 			type->manipulators();
+ 		}
++		if (type->dropboxes) {
 +			type->dropboxes();
++		}
  	}
  
  	/* register internal render callbacks */