[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52208] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: fix [#33169] Interface destroyed after Text Object Edit

[Campbell Barton]

Revision: 52208
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52208
Author:   campbellbarton
Date:     2012-11-14 14:47:45 +0000 (Wed, 14 Nov 2012)
Log Message:
-----------
fix [#33169] Interface destroyed after Text Object Edit

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-11-14 11:06:58 UTC (rev 52207)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c	2012-11-14 14:47:45 UTC (rev 52208)
@@ -3620,10 +3620,7 @@
 	}
 
 	if (drawCurveDerivedMesh(scene, v3d, rv3d, base, dt) == 0) {
-		if (v3d->flag2 & V3D_BACKFACE_CULLING)
-			glDisable(GL_CULL_FACE);
-
-		return 0;
+		goto quit;
 	}
 
 	switch (ob->type) {
@@ -3635,7 +3632,10 @@
 
 			if (solid) {
 				dl = lb->first;
-				if (dl == NULL) return 1;
+				if (dl == NULL) {
+					retval = 1;
+					goto quit;
+				}
 
 				if (dl->nors == NULL) BKE_displist_normals_add(lb);
 				index3_nors_incr = 0;
@@ -3681,7 +3681,10 @@
 
 			if (solid) {
 				dl = lb->first;
-				if (dl == NULL) return 1;
+				if (dl == NULL) {
+					retval = 1;
+					goto quit;
+				}
 
 				if (dl->nors == NULL) BKE_displist_normals_add(lb);
 
@@ -3705,7 +3708,10 @@
 			if (BKE_mball_is_basis(ob)) {
 				lb = &ob->disp;
 				if (lb->first == NULL) BKE_displist_make_mball(scene, ob);
-				if (lb->first == NULL) return 1;
+				if (lb->first == NULL) {
+					retval = 1;
+					goto quit;
+				}
 
 				if (solid) {
 
@@ -3728,6 +3734,7 @@
 			break;
 	}
 	
+quit:
 	if (v3d->flag2 & V3D_BACKFACE_CULLING)
 		glDisable(GL_CULL_FACE);