sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

minor changes, BLI_uvproject_from_view was doing matrix multiply for no reason, quiet float/double warning.

Browse Source
This commit is contained in:
Campbell Barton 2013-04-27 21:56:28 +00:00
parent 25e82fe62d
commit 2810331119
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/blenlib/intern/uvproject.c
View File

@ -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;

2
source/blender/compositor/intern/COM_compositor.cpp
View File

@ -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 */