From 2810331119f09fde9e5f8a090100412c96e6d2e6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 27 Apr 2013 21:56:28 +0000 Subject: [PATCH] minor changes, BLI_uvproject_from_view was doing matrix multiply for no reason, quiet float/double warning. --- source/blender/blenlib/intern/uvproject.c | 4 +--- source/blender/compositor/intern/COM_compositor.cpp | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/source/blender/blenlib/intern/uvproject.c b/source/blender/blenlib/intern/uvproject.c index 05ebc9500a1..a741c9858c3 100644 --- a/source/blender/blenlib/intern/uvproject.c +++ b/source/blender/blenlib/intern/uvproject.c @@ -95,9 +95,7 @@ void BLI_uvproject_from_camera(float target[2], float source[3], ProjCameraInfo /* 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; - - mul_v3_m4v3(pv, rotmat, source); + float pv4[4], x = 0.0, y = 0.0; copy_v3_v3(pv4, source); pv4[3] = 1.0; diff --git a/source/blender/compositor/intern/COM_compositor.cpp b/source/blender/compositor/intern/COM_compositor.cpp index a0eb5206805..a0df8fd1934 100644 --- a/source/blender/compositor/intern/COM_compositor.cpp +++ b/source/blender/compositor/intern/COM_compositor.cpp @@ -67,7 +67,7 @@ void COM_execute(RenderData *rd, bNodeTree *editingtree, int rendering, * 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 */