[Bf-blender-cvs] [78ed4e7] custom-manipulators: Merge branch 'temp_manipulators_core' into custom-manipulators

Julian Eisel noreply at git.blender.org
Fri Oct 7 16:15:42 CEST 2016


Commit: 78ed4e7e20312c1cd541795ba2edfd8fffd68056
Author: Julian Eisel
Date:   Fri Oct 7 16:15:02 2016 +0200
Branches: custom-manipulators
https://developer.blender.org/rB78ed4e7e20312c1cd541795ba2edfd8fffd68056

Merge branch 'temp_manipulators_core' into custom-manipulators

Conflicts:
	source/blender/editors/interface/resources.c
	source/blender/editors/space_api/spacetypes.c
	source/blender/makesdna/DNA_userdef_types.h
	source/blender/windowmanager/CMakeLists.txt
	source/blender/windowmanager/WM_api.h
	source/blender/windowmanager/manipulators/WM_manipulator_api.h
	source/blender/windowmanager/manipulators/WM_manipulator_types.h
	source/blender/windowmanager/manipulators/intern/wm_manipulator.c
	source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
	source/blender/windowmanager/manipulators/intern/wm_manipulatorgroup.c
	source/blender/windowmanager/manipulators/intern/wm_manipulatormap.c

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



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

diff --cc source/blender/windowmanager/wm.h
index 2c4342c,3dd2941..8ea2cf9
--- a/source/blender/windowmanager/wm.h
+++ b/source/blender/windowmanager/wm.h
@@@ -33,18 -33,9 +33,14 @@@
  
  struct wmWindow;
  struct ReportList;
 +struct wmEvent;
 +struct wmOperatorType;
 +struct PointerRNA;
 +struct PropertyRNA;
 +struct wmOperator;
  
 -#include "manipulators/wm_manipulator_wmapi.h"
 +#include "manipulators/wm_manipulator_wmapi.h" /* manipulators wm API */
  
- #include "manipulators/wm_manipulator_wmapi.h"
- 
- #include "manipulators/wm_manipulator_wmapi.h"
- 
  typedef struct wmPaintCursor {
  	struct wmPaintCursor *next, *prev;




More information about the Bf-blender-cvs mailing list