[Bf-blender-cvs] [26e7133] wiggly-widgets: Fix memory leak caused by recent merge conflicts

Julian Eisel noreply at git.blender.org
Fri Dec 4 01:25:28 CET 2015


Commit: 26e7133c66031f4f96baa8199042062eb305ef10
Author: Julian Eisel
Date:   Fri Dec 4 01:24:53 2015 +0100
Branches: wiggly-widgets
https://developer.blender.org/rB26e7133c66031f4f96baa8199042062eb305ef10

Fix memory leak caused by recent merge conflicts

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

M	source/blender/editors/transform/transform_manipulator.c

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

diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c
index aff24a1..ca6cb1b 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1155,12 +1155,7 @@ void WIDGETGROUP_manipulator_create(const struct bContext *C, struct wmWidgetGro
 	}
 	MAN_ITER_AXES_END;
 
-	/* restore */
-
-	glLoadMatrixf(rv3d->viewmat);
-
-	if (v3d->zbuf) glEnable(GL_DEPTH_TEST);
-
+	MEM_freeN(man);
 }
 
 void WIDGETGROUP_object_manipulator_create(const struct bContext *C, struct wmWidgetGroup *wgroup)




More information about the Bf-blender-cvs mailing list