[Bf-blender-cvs] [cdca6e7] gooseberry: Merge branch 'hair_immediate_fixes' into gooseberry

[Lukas Tönne]

Commit: cdca6e7be439837c9e52381c55f8392f85b89daa
Author: Lukas Tönne
Date:   Mon Oct 6 19:02:57 2014 +0200
Branches: gooseberry
https://developer.blender.org/rBcdca6e7be439837c9e52381c55f8392f85b89daa

Merge branch 'hair_immediate_fixes' into gooseberry

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



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

diff --cc source/blender/editors/transform/transform_manipulator.c
index 6fa7cc5,37a6d50..b135ad9
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@@ -1893,11 -1917,7 +1893,11 @@@ int BIF_manipulator_handler(bContext *C
  	}
  	/* after transform, restore drawflags */
  	drawflags = 0xFFFF;
 +	
 +	if (ptr) {
 +		WM_operator_properties_free(ptr);
 +		MEM_freeN(ptr);
 +	}
  
 -	return val;
 +	return (val) ? OPERATOR_FINISHED : OPERATOR_PASS_THROUGH;
- }
+ }
 -