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

[Julian Eisel]

Commit: 2e6be2f7eba94b15970486c42fe66babef765271
Author: Julian Eisel
Date:   Sun Sep 11 14:58:36 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB2e6be2f7eba94b15970486c42fe66babef765271

Merge branch 'temp_manipulators_core' into wiggly-widgets

Conflicts:
	source/blender/windowmanager/CMakeLists.txt

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



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

diff --cc source/blender/windowmanager/CMakeLists.txt
index 66ef8b9,c9cf538..c2eeb63
--- a/source/blender/windowmanager/CMakeLists.txt
+++ b/source/blender/windowmanager/CMakeLists.txt
@@@ -70,19 -70,18 +70,19 @@@ set(SR
  	intern/wm_subwindow.c
  	intern/wm_window.c
  	intern/wm_stereo.c
- 	widgets/intern/wm_widget.c
- 	widgets/intern/wm_widgetgroup.c
- 	widgets/intern/wm_widgetmap.c
- 	widgets/intern/widget_library/arrow_widget.c
- 	widgets/intern/widget_library/arrow2d_widget.c
- 	widgets/intern/widget_library/cage_widget.c
- 	widgets/intern/widget_library/dial_widget.c
- 	widgets/intern/widget_library/facemap_widget.c
- 	widgets/intern/widget_library/primitive_widget.c
- 	widgets/intern/widget_library/geom_arrow_widget.c
- 	widgets/intern/widget_library/geom_cube_widget
- 	widgets/intern/widget_library/geom_dial_widget.c
- 	widgets/intern/widget_library/widget_library_utils.c
+ 	manipulators/intern/wm_manipulator.c
+ 	manipulators/intern/wm_manipulatorgroup.c
+ 	manipulators/intern/wm_manipulatormap.c
+ 	manipulators/intern/manipulator_library/arrow_manipulator.c
+ 	manipulators/intern/manipulator_library/arrow2d_manipulator.c
+ 	manipulators/intern/manipulator_library/cage_manipulator.c
+ 	manipulators/intern/manipulator_library/dial_manipulator.c
++	manipulators/intern/manipulator_library/facemap_widget.c
+ 	manipulators/intern/manipulator_library/primitive_manipulator.c
+ 	manipulators/intern/manipulator_library/geom_arrow_manipulator.c
+ 	manipulators/intern/manipulator_library/geom_cube_manipulator.c
+ 	manipulators/intern/manipulator_library/geom_dial_manipulator.c
+ 	manipulators/intern/manipulator_library/manipulator_library_utils.c
  
  	WM_api.h
  	WM_keymap.h