[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52994] trunk/blender/source/blender/ editors/space_image/image_edit.c: Fix #33525: Mask points are add offset for the mouse when adding on viewer node with aspect ! = 1

Sergey Sharybin sergey.vfx at gmail.com
Fri Dec 14 10:19:16 CET 2012


Revision: 52994
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52994
Author:   nazgul
Date:     2012-12-14 09:19:13 +0000 (Fri, 14 Dec 2012)
Log Message:
-----------
Fix #33525: Mask points are add offset for the mouse when adding on viewer node with aspect != 1

It was strange logic in code from 2010 which forced image aspect to be 1 for
viewer nodes and render results.

Not sure why it's needed, was only used for unwrapping aspect correction,
but render result/viewer images are already handled differently there.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_image/image_edit.c

Modified: trunk/blender/source/blender/editors/space_image/image_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_edit.c	2012-12-14 08:48:48 UTC (rev 52993)
+++ trunk/blender/source/blender/editors/space_image/image_edit.c	2012-12-14 09:19:13 UTC (rev 52994)
@@ -194,9 +194,7 @@
 void ED_space_image_get_aspect(SpaceImage *sima, float *aspx, float *aspy)
 {
 	Image *ima = sima->image;
-	if ((ima == NULL) || (ima->type == IMA_TYPE_R_RESULT) || (ima->type == IMA_TYPE_COMPOSITE) ||
-	    (ima->aspx == 0.0f || ima->aspy == 0.0f))
-	{
+	if ((ima == NULL) || (ima->aspx == 0.0f || ima->aspy == 0.0f)) {
 		*aspx = *aspy = 1.0;
 	}
 	else {




More information about the Bf-blender-cvs mailing list