Commit: 9947b1fda69ccc4f6fd2310d5ce603dc32a55a94 Author: Campbell Barton Date: Tue May 12 12:53:48 2020 +1000 Branches: master https://developer.blender.org/rB9947b1fda69ccc4f6fd2310d5ce603dc32a55a94
Merge branch 'blender-v2.83-release' =================================================================== =================================================================== diff --cc source/blender/editors/interface/interface_intern.h index 1c6b9632ddb,3ded62dca7f..3748dbab519 --- a/source/blender/editors/interface/interface_intern.h +++ b/source/blender/editors/interface/interface_intern.h @@@ -606,8 -601,10 +609,8 @@@ struct uiPopupBlockHandle /* for operator popups */ struct wmOperator *popup_op; - ScrArea *ctx_area; - ARegion *ctx_region; - struct wmOperatorType *optype; + struct ScrArea *ctx_area; + struct ARegion *ctx_region; - int opcontext; /* return values */ int butretval; @@@ -707,7 -709,7 +716,7 @@@ uiPopupBlockHandle *ui_popover_panel_cr void ui_pie_menu_level_create(uiBlock *block, struct wmOperatorType *ot, const char *propname, -- IDProperty *properties, ++ struct IDProperty *properties, const EnumPropertyItem *items, int totitem, int context, _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs