[Bf-blender-cvs] [4bb2efc] HMD_viewport: Merge branch 'master' into HMD_viewport

[Julian Eisel]

Commit: 4bb2efcb6ea786a5e56b4fb512481b0f574d278b
Author: Julian Eisel
Date:   Sun Apr 10 01:42:21 2016 +0200
Branches: HMD_viewport
https://developer.blender.org/rB4bb2efcb6ea786a5e56b4fb512481b0f574d278b

Merge branch 'master' into HMD_viewport

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



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

diff --cc source/blender/editors/interface/interface_handlers.c
index a2ee8c7,023439f..65bd828
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -6673,10 -6673,10 +6673,10 @@@ static bool ui_but_menu(bContext *C, ui
  			}
  			else {
  				uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Insert Keyframe"),
- 				               ICON_NONE, "ANIM_OT_keyframe_insert_button", "all", 1);
+ 				               ICON_KEY_HLT, "ANIM_OT_keyframe_insert_button", "all", 1);
  			}
  		}
 -		
 +
  		if ((but->flag & UI_BUT_ANIMATED) && (but->rnapoin.type != &RNA_NlaStrip)) {
  			if (is_array_component) {
  				uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Clear Keyframes"),
@@@ -6755,17 -6755,17 +6755,17 @@@
  				        ICON_NONE, "ANIM_OT_keyingset_button_remove");
  			}
  		}
 -		
 +
  		uiItemS(layout);
 -		
 +
  		/* Property Operators */
 -		
 +
  		/* Copy Property Value
  		 * Paste Property Value */
 -		
 +
  		if (is_array_component) {
  			uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Reset All to Default Values"),
- 			               ICON_NONE, "UI_OT_reset_default_button", "all", 1);
+ 			               ICON_LOOP_BACK, "UI_OT_reset_default_button", "all", 1);
  			uiItemBooleanO(layout, CTX_IFACE_(BLT_I18NCONTEXT_OPERATOR_DEFAULT, "Reset Single to Default Value"),
  			               ICON_NONE, "UI_OT_reset_default_button", "all", 0);
  		}