Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2020-02-20 14:53:03 +0300
committerJulian Eisel <eiseljulian@gmail.com>2020-02-20 14:53:03 +0300
commitaf928a2fb1d705147db914b954a56de42c34f76e (patch)
treea8a34c37a28ef793b5dbcb7bd86076b11ec951f4 /source/blender/windowmanager/WM_api.h
parent27bbbc9c575a7c8b95fa0d65f7d854aa294ca85f (diff)
parentb1c94343320b0db821b506d85942753d71e95a81 (diff)
Merge branch 'temp-openxr-ghostxr' into temp-openxr-blenderside
Diffstat (limited to 'source/blender/windowmanager/WM_api.h')
-rw-r--r--source/blender/windowmanager/WM_api.h7
1 files changed, 2 insertions, 5 deletions
diff --git a/source/blender/windowmanager/WM_api.h b/source/blender/windowmanager/WM_api.h
index 8c264458a5c..d9e524c66f4 100644
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@ -382,12 +382,9 @@ int WM_operator_props_popup_call(struct bContext *C,
int WM_operator_props_popup(struct bContext *C,
struct wmOperator *op,
const struct wmEvent *event);
-int WM_operator_props_dialog_popup(struct bContext *C,
- struct wmOperator *op,
- int width,
- int height);
+int WM_operator_props_dialog_popup(struct bContext *C, struct wmOperator *op, int width);
int WM_operator_redo_popup(struct bContext *C, struct wmOperator *op);
-int WM_operator_ui_popup(struct bContext *C, struct wmOperator *op, int width, int height);
+int WM_operator_ui_popup(struct bContext *C, struct wmOperator *op, int width);
int WM_operator_confirm_message_ex(struct bContext *C,
struct wmOperator *op,