[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56015] trunk/blender/source/blender/ editors: Fix: uiBlockSetNFunc was using uiButHandleFunc as param signature, instead of uiButHandleNFunc one ( was working because both are the same currently).

[Bastien Montagne]

Revision: 56015
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56015
Author:   mont29
Date:     2013-04-13 16:28:39 +0000 (Sat, 13 Apr 2013)
Log Message:
-----------
Fix: uiBlockSetNFunc was using uiButHandleFunc as param signature, instead of 
uiButHandleNFunc one (was working because both are the same currently).

Modified Paths:
--------------
    trunk/blender/source/blender/editors/include/UI_interface.h
    trunk/blender/source/blender/editors/interface/interface.c

Modified: trunk/blender/source/blender/editors/include/UI_interface.h
===================================================================
--- trunk/blender/source/blender/editors/include/UI_interface.h 2013-04-13 
16:26:55 UTC (rev 56014)
+++ trunk/blender/source/blender/editors/include/UI_interface.h 2013-04-13 
16:28:39 UTC (rev 56015)
@@ -630,11 +630,11 @@
 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);
 

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c  2013-04-13 
16:26:55 UTC (rev 56014)
+++ trunk/blender/source/blender/editors/interface/interface.c  2013-04-13 
16:28:39 UTC (rev 56015)
@@ -3617,13 +3617,13 @@
        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;
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs