[Bf-blender-cvs] [0a4bf53] master: Correct own error with recent commit

[Campbell Barton]

Commit: 0a4bf5317fe3b02bca1d6fe730bff99d09e1561c
Author: Campbell Barton
Date:   Sat May 30 20:26:26 2015 +1000
Branches: master
https://developer.blender.org/rB0a4bf5317fe3b02bca1d6fe730bff99d09e1561c

Correct own error with recent commit

Caused entering an invalid number to leak.

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

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

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

diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c
index dc2c035..4548c09 100644
--- a/source/blender/editors/interface/interface_handlers.c
+++ b/source/blender/editors/interface/interface_handlers.c
@@ -1942,6 +1942,7 @@ static void ui_apply_but(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
 
 		if (data->str) MEM_freeN(data->str);
 		data->str = data->origstr;
+		data->origstr = NULL;
 		data->value = data->origvalue;
 		copy_v3_v3(data->vec, data->origvec);
 		/* postpone clearing origdata */
@@ -2085,7 +2086,6 @@ static void ui_apply_but(bContext *C, uiBlock *block, uiBut *but, uiHandleButton
 #endif
 
 	if (data->cancel) {
-		data->origstr = NULL;
 		data->origvalue = 0.0;
 		zero_v3(data->origvec);
 	}