diff options
author | Bastien Montagne <montagne29@wanadoo.fr> | 2013-04-13 20:28:39 +0400 |
---|---|---|
committer | Bastien Montagne <montagne29@wanadoo.fr> | 2013-04-13 20:28:39 +0400 |
commit | 649b92e6886965153abcc4311a93d7ed876a4c7a (patch) | |
tree | c4df66bc92dc82172569a9658bab6baafe0205cf /source | |
parent | ceacf24e3d6a0cb5dfc10aa6cc7cc0403ddf9c38 (diff) |
Fix: uiBlockSetNFunc was using uiButHandleFunc as param signature, instead of uiButHandleNFunc one (was working because both are the same currently).
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/include/UI_interface.h | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/include/UI_interface.h b/source/blender/editors/include/UI_interface.h index 7e1bd2b9eb6..e8ce5f419bf 100644 --- a/source/blender/editors/include/UI_interface.h +++ b/source/blender/editors/include/UI_interface.h @@ -630,11 +630,11 @@ int uiSearchBoxWidth(void); void uiBlockSetHandleFunc(uiBlock *block, uiBlockHandleFunc func, void *arg); void uiBlockSetButmFunc(uiBlock *block, uiMenuHandleFunc func, void *arg); void uiBlockSetFunc(uiBlock *block, uiButHandleFunc func, void *arg1, void *arg2); -void uiBlockSetNFunc(uiBlock *block, uiButHandleFunc func, void *argN, void *arg2); +void uiBlockSetNFunc(uiBlock *block, uiButHandleNFunc funcN, void *argN, void *arg2); void uiButSetRenameFunc(uiBut *but, uiButHandleRenameFunc func, void *arg1); void uiButSetFunc(uiBut *but, uiButHandleFunc func, void *arg1, void *arg2); -void uiButSetNFunc(uiBut *but, uiButHandleNFunc func, void *argN, void *arg2); +void uiButSetNFunc(uiBut *but, uiButHandleNFunc funcN, void *argN, void *arg2); void uiButSetCompleteFunc(uiBut *but, uiButCompleteFunc func, void *arg); diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 8fbb293d586..b5b92976c82 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3617,13 +3617,13 @@ void uiBlockSetFunc(uiBlock *block, uiButHandleFunc func, void *arg1, void *arg2 block->func_arg2 = arg2; } -void uiBlockSetNFunc(uiBlock *block, uiButHandleFunc func, void *argN, void *arg2) +void uiBlockSetNFunc(uiBlock *block, uiButHandleNFunc funcN, void *argN, void *arg2) { if (block->func_argN) { MEM_freeN(block->func_argN); } - block->funcN = func; + block->funcN = funcN; block->func_argN = argN; block->func_arg2 = arg2; } |