[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57777] trunk/blender/source/blender/ editors/sculpt_paint/paint_image_proj.c: Correction to previous commit.

[Antony Riakiotakis]

Revision: 57777
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57777
Author:   psy-fi
Date:     2013-06-26 14:33:28 +0000 (Wed, 26 Jun 2013)
Log Message:
-----------
Correction to previous commit. Reverse order of checking or you could
get perspective screen coordinates for orthonormal view.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c

Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c	2013-06-26 14:28:39 UTC (rev 57776)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c	2013-06-26 14:33:28 UTC (rev 57777)
@@ -2313,8 +2313,8 @@
 
 						has_x_isect = has_isect = 1;
 
-						if (is_clone_other) screen_px_from_persp_ortho_weights(uv, v1coSS, v2coSS, v3coSS, uv1co, uv2co, uv3co, pixelScreenCo, w);
-						else if (is_ortho) screen_px_from_ortho(uv, v1coSS, v2coSS, v3coSS, uv1co, uv2co, uv3co, pixelScreenCo, w);
+						if (is_ortho) screen_px_from_ortho(uv, v1coSS, v2coSS, v3coSS, uv1co, uv2co, uv3co, pixelScreenCo, w);
+						else if (is_clone_other) screen_px_from_persp_ortho_weights(uv, v1coSS, v2coSS, v3coSS, uv1co, uv2co, uv3co, pixelScreenCo, w);
 						else screen_px_from_persp(uv, v1coSS, v2coSS, v3coSS, uv1co, uv2co, uv3co, pixelScreenCo, w);
 
 						/* a pity we need to get the worldspace pixel location here */