[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34972] trunk/blender/source/blender/ editors/interface/interface.c: Fix for #26111, #26112 & #26121, " only first button click worked in windows"

[Janne Karhu]

Revision: 34972
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34972
Author:   jhk
Date:     2011-02-18 15:06:02 +0000 (Fri, 18 Feb 2011)
Log Message:
-----------
Fix for #26111, #26112 & #26121, "only first button click worked in windows"
* In windows the old button was tested to be equal to the new button (ui_but_equals_old()) even if their optype wasn't the same. Adding a check for optypes fixes all three reported issues.
* For some strange reason this didn't happen on other platforms.

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

Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c	2011-02-18 14:55:42 UTC (rev 34971)
+++ trunk/blender/source/blender/editors/interface/interface.c	2011-02-18 15:06:02 UTC (rev 34972)
@@ -497,6 +497,7 @@
 	if(oldbut->func_arg1 != oldbut && but->func_arg1 != oldbut->func_arg1) return 0;
 	if(oldbut->func_arg2 != oldbut && but->func_arg2 != oldbut->func_arg2) return 0;
 	if(!but->funcN && ((but->poin != oldbut->poin && (uiBut*)oldbut->poin != oldbut) || but->pointype != oldbut->pointype)) return 0;
+	if(but->optype != oldbut->optype) return 0;
 
 	return 1;
 }