[Bf-blender-cvs] [6135797] master: Fix for button comparisons ignoring rna-index

Campbell Barton noreply at git.blender.org
Fri Feb 7 15:34:34 CET 2014


Commit: 6135797ec811e097a1c9f7c3814d720e677a25ba
Author: Campbell Barton
Date:   Sat Feb 8 01:33:39 2014 +1100
https://developer.blender.org/rB6135797ec811e097a1c9f7c3814d720e677a25ba

Fix for button comparisons ignoring rna-index

===================================================================

M	source/blender/editors/interface/interface.c

===================================================================

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 6121a13..f66699e 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -513,7 +513,7 @@ static bool ui_but_equals_old(const uiBut *but, const uiBut *oldbut)
 	 * to catch all cases, but it is simple to add more checks later */
 	if (but->retval != oldbut->retval) return false;
 	if (but->rnapoin.data != oldbut->rnapoin.data) return false;
-	if (but->rnaprop != oldbut->rnaprop && but->rnaindex != oldbut->rnaindex) return false;
+	if (but->rnaprop != oldbut->rnaprop || but->rnaindex != oldbut->rnaindex) return false;
 	if (but->func != oldbut->func) return false;
 	if (but->funcN != oldbut->funcN) return false;
 	if (oldbut->func_arg1 != oldbut && but->func_arg1 != oldbut->func_arg1) return false;




More information about the Bf-blender-cvs mailing list