[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55496] trunk/blender/source/blender/ compositor/intern/COM_compositor.cpp: Fix for compositor node preview sizes : Use the render output aspect ratio for estimating the required preview rect size instead of assuming a square , to avoid wasted space.

Lukas Toenne lukas.toenne at googlemail.com
Fri Mar 22 09:50:56 CET 2013


Revision: 55496
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55496
Author:   lukastoenne
Date:     2013-03-22 08:50:56 +0000 (Fri, 22 Mar 2013)
Log Message:
-----------
Fix for compositor node preview sizes: Use the render output aspect ratio for estimating the required preview rect size instead of assuming a square, to avoid wasted space. Note that this does not work for newly added nodes until they have first been evaluated and a preview image has been generated (same behavior as before pynodes merge and associated preview changes).

Modified Paths:
--------------
    trunk/blender/source/blender/compositor/intern/COM_compositor.cpp

Modified: trunk/blender/source/blender/compositor/intern/COM_compositor.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_compositor.cpp	2013-03-22 08:45:45 UTC (rev 55495)
+++ trunk/blender/source/blender/compositor/intern/COM_compositor.cpp	2013-03-22 08:50:56 UTC (rev 55496)
@@ -65,8 +65,10 @@
 
 	/* Make sure node tree has previews.
 	 * Don't create previews in advance, this is done when adding preview operations.
+	 * Reserved preview size is determined by render output for now.
 	 */
-	BKE_node_preview_init_tree(editingtree, COM_PREVIEW_SIZE, COM_PREVIEW_SIZE, FALSE);
+	float aspect = rd->xsch > 0 ? (float)rd->ysch / (float)rd->xsch : 1.0;
+	BKE_node_preview_init_tree(editingtree, COM_PREVIEW_SIZE, (int)(COM_PREVIEW_SIZE * aspect), FALSE);
 
 	/* initialize workscheduler, will check if already done. TODO deinitialize somewhere */
 	bool use_opencl = (editingtree->flag & NTREE_COM_OPENCL);




More information about the Bf-blender-cvs mailing list