diff options
author | ack-err <ack-err> | 2013-09-01 19:58:53 +0400 |
---|---|---|
committer | ack-err <ack-err> | 2013-09-01 19:58:53 +0400 |
commit | ce1c83a5cfc0b1fc75f1cabffbc8207c69aa3fc6 (patch) | |
tree | b25001cc158ad3dd68c266d591854d1b51e4fc99 | |
parent | 8729239ba660f809614116e5f1a436fa95e6a550 (diff) |
Fixed another strict compilation error, mixed declarations and code.
-rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 4224137fae1..de1a5647883 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -4161,13 +4161,14 @@ void add_to_icon_shelf(bContext *C, void *arg1, void *UNUSED(arg2)) if (ar && arg1) { wmOperatorType *ot = (wmOperatorType*)arg1; + OperatorListItem *oli; if (BLI_findstring(&ar->operators, ot->idname, offsetof(OperatorListItem, optype_idname))) { BKE_reportf(&wm->reports, RPT_INFO, "This operator (%s) is already present in the menubar.", ot->idname); return; } - OperatorListItem *oli = MEM_callocN(sizeof(OperatorListItem), "add operator list item to icon shelf"); + oli = MEM_callocN(sizeof(OperatorListItem), "add operator list item to icon shelf"); BLI_strncpy(oli->optype_idname, ot->idname, OP_MAX_TYPENAME); BLI_strncpy(oli->context, CTX_data_mode_string(C), MAX_NAME); @@ -4186,7 +4187,6 @@ void add_to_custom_panel_menu(bContext *C, uiLayout *layout, void *arg1) PropertyRNA *prop; wmOperatorType *optype = (wmOperatorType*)arg1; - ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS); if (ar == NULL) return; |