[Bf-blender-cvs] [0dce80ad432] id_override_static: Merge branch 'master' into id_override_static

[Bastien Montagne]

Commit: 0dce80ad4323822c95429d782c51c105b18a4e18
Author: Bastien Montagne
Date:   Mon Nov 6 16:08:23 2017 +0100
Branches: id_override_static
https://developer.blender.org/rB0dce80ad4323822c95429d782c51c105b18a4e18

Merge branch 'master' into id_override_static

Conflicts:
	source/blender/editors/interface/interface_handlers.c

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



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

diff --cc source/blender/editors/interface/interface_handlers.c
index bee85fadefc,4dfb1a92bf6..2beee5a4862
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@@ -6789,14 -6790,9 +6793,8 @@@ static bool ui_but_menu(bContext *C, ui
  		/*bool is_idprop = RNA_property_is_idprop(prop);*/ /* XXX does not work as expected, not strictly needed */
  		bool is_set = RNA_property_is_set(ptr, prop);
  
 -		/* Set the (button_pointer, button_prop) and pointer data for Python access to the hovered ui element. */
 -		uiLayoutSetContextFromBut(layout, but);
 +		RNA_property_override_status(ptr, prop, -1, &is_overridable, NULL, NULL, NULL);
  
- 		/* set the prop and pointer data for python access to the hovered ui element; TODO, index could be supported as well*/
- 		PointerRNA temp_ptr;
- 		RNA_pointer_create(NULL, &RNA_Property, but->rnaprop, &temp_ptr);
- 		uiLayoutSetContextPointer(layout, "button_prop", &temp_ptr);
- 		uiLayoutSetContextPointer(layout, "button_pointer", ptr);
- 
  		/* second slower test, saved people finding keyframe items in menus when its not possible */
  		if (is_anim)
  			is_anim = RNA_property_path_from_ID_check(&but->rnapoin, but->rnaprop);