[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56350] trunk/blender/source/blender: minor changes, BLI_uvproject_from_view was doing matrix multiply for no reason, quiet float/double warning.

[Campbell Barton]

Revision: 56350
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56350
Author:   campbellbarton
Date:     2013-04-27 21:56:28 +0000 (Sat, 27 Apr 2013)
Log Message:
-----------
minor changes, BLI_uvproject_from_view was doing matrix multiply for no reason, quiet float/double warning.

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

Modified: trunk/blender/source/blender/blenlib/intern/uvproject.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/uvproject.c	2013-04-27 19:40:23 UTC (rev 56349)
+++ trunk/blender/source/blender/blenlib/intern/uvproject.c	2013-04-27 21:56:28 UTC (rev 56350)
@@ -95,10 +95,8 @@
 /* could rv3d->persmat */
 void BLI_uvproject_from_view(float target[2], float source[3], float persmat[4][4], float rotmat[4][4], float winx, float winy)
 {
-	float pv[3], pv4[4], x = 0.0, y = 0.0;
+	float pv4[4], x = 0.0, y = 0.0;
 
-	mul_v3_m4v3(pv, rotmat, source);
-
 	copy_v3_v3(pv4, source);
 	pv4[3] = 1.0;
 

Modified: trunk/blender/source/blender/compositor/intern/COM_compositor.cpp
===================================================================
--- trunk/blender/source/blender/compositor/intern/COM_compositor.cpp	2013-04-27 19:40:23 UTC (rev 56349)
+++ trunk/blender/source/blender/compositor/intern/COM_compositor.cpp	2013-04-27 21:56:28 UTC (rev 56350)
@@ -67,7 +67,7 @@
 	 * Don't create previews in advance, this is done when adding preview operations.
 	 * Reserved preview size is determined by render output for now.
 	 */
-	float aspect = rd->xsch > 0 ? (float)rd->ysch / (float)rd->xsch : 1.0;
+	float aspect = rd->xsch > 0 ? (float)rd->ysch / (float)rd->xsch : 1.0f;
 	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 */