[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12758] trunk/blender/source/blender/src:

Brecht Van Lommel brechtvanlommel at pandora.be
Sun Dec 2 15:48:24 CET 2007


Revision: 12758
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12758
Author:   blendix
Date:     2007-12-02 15:48:24 +0100 (Sun, 02 Dec 2007)

Log Message:
-----------

Bugfix for earlier commit, with OpenGL render the 3d view transforms
were not always set correct.

Modified Paths:
--------------
    trunk/blender/source/blender/src/drawview.c
    trunk/blender/source/blender/src/renderwin.c

Modified: trunk/blender/source/blender/src/drawview.c
===================================================================
--- trunk/blender/source/blender/src/drawview.c	2007-12-02 09:54:01 UTC (rev 12757)
+++ trunk/blender/source/blender/src/drawview.c	2007-12-02 14:48:24 UTC (rev 12758)
@@ -3096,6 +3096,9 @@
 	Scene *sce;
 	float v3dwinmat[4][4];
 	
+	if(!winmat)
+		setwinmatrixview3d(winx, winy, NULL);
+
 	setviewmatrixview3d();
 	myloadmatrix(v3d->viewmat);
 
@@ -3103,8 +3106,6 @@
 	glMatrixMode(GL_PROJECTION);
 	if(winmat)
 		myloadmatrix(winmat);
-	else
-		setwinmatrixview3d(winx, winy, NULL);
 	mygetmatrix(v3dwinmat);
 	glMatrixMode(GL_MODELVIEW);
 

Modified: trunk/blender/source/blender/src/renderwin.c
===================================================================
--- trunk/blender/source/blender/src/renderwin.c	2007-12-02 09:54:01 UTC (rev 12757)
+++ trunk/blender/source/blender/src/renderwin.c	2007-12-02 14:48:24 UTC (rev 12758)
@@ -1247,7 +1247,7 @@
 
 	update_for_newframe_muted();	/* here, since camera can be animated */
 
-	if(v3d->camera) {
+	if(v3d->persp==2 && v3d->camera) {
 		/* in camera view, use actual render winmat */
 		RE_GetCameraWindow(re, v3d->camera, CFRA, winmat);
 		drawview3d_render(v3d, winx, winy, winmat);





More information about the Bf-blender-cvs mailing list