[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19611] branches/soc-2008-mxcurioni/source /blender/freestyle/intern: Corrected the problem of the view moving after a Freestyle render, when positioned at the camera location

[Maxime Curioni]

Revision: 19611
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19611
Author:   mxcurioni
Date:     2009-04-08 23:44:38 +0200 (Wed, 08 Apr 2009)

Log Message:
-----------
Corrected the problem of the view moving after a Freestyle render, when positioned at the camera location

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.h
    branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StyleModule.h

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp	2009-04-08 21:40:55 UTC (rev 19610)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/app_blender/Controller.cpp	2009-04-08 21:44:38 UTC (rev 19611)
@@ -645,7 +645,8 @@
 	BlenderStrokeRenderer* blenderRenderer = new BlenderStrokeRenderer;
   	_Canvas->Render( blenderRenderer );
 	Render* freestyle_render = blenderRenderer->RenderScene(re);
-	blenderRenderer->Close();
+	delete blenderRenderer;
+	
 	return freestyle_render;
 }
 

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp	2009-04-08 21:40:55 UTC (rev 19610)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.cpp	2009-04-08 21:44:38 UTC (rev 19611)
@@ -56,7 +56,7 @@
 	lb = scene->r.layers;
 	scene->r= old_scene->r;
 	scene->r.layers= lb;
-	set_scene( scene );
+	set_scene_bg( scene );
 
 	// image dimensions
 	float width = scene->r.xsch;
@@ -89,14 +89,11 @@
 	    _textureManager = 0;
 	  }
 	
-	// DEALLOCATE STRUCTURE
-
-	// Scene* scene;
-	// Object* object_camera;
-	// Material* material;
+	free_scene( scene );
+	free_object( object_camera );
+	free_material( material );
 	
-	// Scene* old_scene;
-	
+	set_scene_bg( old_scene );
 }
 
 void BlenderStrokeRenderer::RenderStrokeRep(StrokeRep *iStrokeRep) const{
@@ -239,30 +236,3 @@
 	RE_BlenderFrame( freestyle_render, scene, 1);
 	return freestyle_render;
 }
-
-void BlenderStrokeRenderer::Close() {
-		
-	Scene *sce;
-	bScreen *sc;
-	
-	// from header_info.c	
-	/* check all sets */
-	for( sce= (Scene*) G.main->scene.first; sce; sce= (Scene*)sce->id.next) {
-		if(sce->set == scene) sce->set= 0;
-	}
-	
-	/* check all sequences */
-	clear_scene_in_allseqs(scene);
-	
-	/* check render layer nodes in other scenes */
-	clear_scene_in_nodes(scene);
-	
-	for (sc= (bScreen*)G.main->screen.first; sc; sc= (bScreen*)sc->id.next ) {
-		if(sc->scene == scene) sc->scene= G.scene;
-	}
-	
-	free_libblock( &G.main->scene, scene );
-	set_scene( old_scene );
-	countall();
-}
-

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.h	2009-04-08 21:40:55 UTC (rev 19610)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/BlenderStrokeRenderer.h	2009-04-08 21:44:38 UTC (rev 19611)
@@ -31,7 +31,6 @@
   virtual void RenderStrokeRepBasic(StrokeRep *iStrokeRep) const;
 
 	Render* RenderScene(Render *re);
-	void Close();
 
 protected:
 	Scene* scene;

Modified: branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StyleModule.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StyleModule.h	2009-04-08 21:40:55 UTC (rev 19610)
+++ branches/soc-2008-mxcurioni/source/blender/freestyle/intern/stroke/StyleModule.h	2009-04-08 21:44:38 UTC (rev 19611)
@@ -69,7 +69,7 @@
 
     Operators::reset();
 	int errorCode;
-    if( errorCode = _inter->interpretFile(_file_name)) {
+    if( (errorCode = _inter->interpretFile(_file_name)) ) {
       cerr << "Error: interpretation failed with code " << errorCode << endl;
       return NULL;
 	}