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

[Julian Eisel]

Commit: f5cec79f19ce1215245f08f7af7e141248d22a4b
Author: Julian Eisel
Date:   Mon Apr 4 21:44:21 2016 +0200
Branches: wiggly-widgets
https://developer.blender.org/rBf5cec79f19ce1215245f08f7af7e141248d22a4b

Merge branch 'master' into wiggly-widgets

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



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

diff --cc source/blender/editors/interface/interface_intern.h
index 7b648ca,f02aad1..008bfe9
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@@ -745,9 -746,6 +746,10 @@@ struct wmKeyMap *eyedropper_modal_keyma
  void UI_OT_eyedropper_color(struct wmOperatorType *ot);
  void UI_OT_eyedropper_id(struct wmOperatorType *ot);
  void UI_OT_eyedropper_depth(struct wmOperatorType *ot);
+ void UI_OT_eyedropper_driver(struct wmOperatorType *ot);
  
 +
 +/* interface_generic_widgets.c */
 +void UI_OT_lamp_position(struct wmOperatorType *ot);
 +
  #endif  /* __INTERFACE_INTERN_H__ */