[Bf-blender-cvs] [5fe11d4] gooseberry: Merge branch 'master' into gooseberry

[Campbell Barton]

Commit: 5fe11d4c401c74a729f2246293f659c731204d02
Author: Campbell Barton
Date:   Thu Jan 15 06:43:24 2015 +1100
Branches: gooseberry
https://developer.blender.org/rB5fe11d4c401c74a729f2246293f659c731204d02

Merge branch 'master' into gooseberry

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



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

diff --cc source/blender/editors/interface/interface_intern.h
index 37cb926,54ba3d7..962a93a
--- a/source/blender/editors/interface/interface_intern.h
+++ b/source/blender/editors/interface/interface_intern.h
@@@ -694,9 -694,6 +694,10 @@@ void ui_but_anim_autokey(struct bContex
  /* interface_eyedropper.c */
  void UI_OT_eyedropper_color(struct wmOperatorType *ot);
  void UI_OT_eyedropper_id(struct wmOperatorType *ot);
+ void UI_OT_eyedropper_depth(struct wmOperatorType *ot);
  
 +
 +/* interface_generic_widgets.c */
 +void UI_OT_lamp_position(struct wmOperatorType *ot);
 +
  #endif  /* __INTERFACE_INTERN_H__ */