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

[Julian Eisel]

Commit: 1678280544f27ef4324caaf337c41c3be4a78587
Author: Julian Eisel
Date:   Thu Sep 22 02:18:39 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB1678280544f27ef4324caaf337c41c3be4a78587

Merge branch 'temp_manipulators_core' into wiggly-widgets

Had to merge again to port over fixes from temp_manipulators_core.

Conflicts:
	source/blender/editors/space_api/spacetypes.c

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



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

diff --cc source/blender/editors/space_api/spacetypes.c
index 208cf7c,597c724..4a84efa
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@@ -131,9 -129,9 +129,12 @@@ void ED_spacetypes_init(void
  		if (type->manipulators) {
  			type->manipulators();
  		}
+ 		if (type->operatortypes) {
+ 			type->operatortypes();
+ 		}
 +		if (type->dropboxes) {
 +			type->dropboxes();
 +		}
  	}
  
  	/* register internal render callbacks */