[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58344] branches/soc-2013-paint/source/ blender/editors/interface/interface_handlers.c: Fix memory leak in invalid drags, also add byte image case (should

[Antony Riakiotakis]

Revision: 58344
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58344
Author:   psy-fi
Date:     2013-07-17 15:34:03 +0000 (Wed, 17 Jul 2013)
Log Message:
-----------
Fix memory leak in invalid drags, also add byte image case (should
probably be color corrected but I need a use case to test)

Modified Paths:
--------------
    branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c

Modified: branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c
===================================================================
--- branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c	2013-07-17 15:22:01 UTC (rev 58343)
+++ branches/soc-2013-paint/source/blender/editors/interface/interface_handlers.c	2013-07-17 15:34:03 UTC (rev 58344)
@@ -958,6 +958,9 @@
 			} else if (but->pointype == UI_BUT_POIN_FLOAT) {
 				copy_v3_v3(drag_info->color, (float *)but->poin);
 				valid = true;
+			} else if (but->pointype == UI_BUT_POIN_CHAR) {
+				rgba_uchar_to_float(drag_info->color, but->poin);
+				valid = true;
 			}
 
 			if (valid)
@@ -965,6 +968,9 @@
 			                        ui_handler_region_drag_color,
 			                        ui_handler_region_drag_color_remove,
 			                        drag_info);
+			else {
+				MEM_freeN(drag_info);
+			}
 		}
 		else
 		{