[Bf-blender-cvs] [381e8d0] temp_widgets_update_tagging: Merge branch 'master' into temp_widgets_update_tagging

[Julian Eisel]

Commit: 381e8d0e9ed38b9e035727686a044941b60303c3
Author: Julian Eisel
Date:   Mon Apr 4 21:48:23 2016 +0200
Branches: temp_widgets_update_tagging
https://developer.blender.org/rB381e8d0e9ed38b9e035727686a044941b60303c3

Merge branch 'master' into temp_widgets_update_tagging

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



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

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__ */