[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57057] trunk/blender/source/blender/ editors/space_view3d/view3d_view.c: Fix #35506: enter local view, enable render draw mode, exit local view.

[Brecht Van Lommel]

Revision: 57057
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57057
Author:   blendix
Date:     2013-05-27 17:21:20 +0000 (Mon, 27 May 2013)
Log Message:
-----------
Fix #35506: enter local view, enable render draw mode, exit local view. In this
case the render engine would keep working invisible in the background.

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

Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2013-05-27 17:13:36 UTC (rev 57056)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c	2013-05-27 17:21:20 UTC (rev 57057)
@@ -64,6 +64,8 @@
 #include "ED_screen.h"
 #include "ED_armature.h"
 
+#include "RE_engine.h"
+
 #ifdef WITH_GAMEENGINE
 #include "BL_System.h"
 #endif
@@ -1216,6 +1218,13 @@
 					rv3d->localvd = NULL;
 				}
 			}
+
+			if (v3d->drawtype != OB_RENDER) {
+				if (rv3d->render_engine) {
+					RE_engine_free(rv3d->render_engine);
+					rv3d->render_engine = NULL;
+				}
+			}
 		}
 	}
 }