[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31477] trunk/blender/source/blender/ editors/render/render_preview.c: Fix #23350: flip "both" texture preview order from material-texture to

[Brecht Van Lommel]

Revision: 31477
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31477
Author:   blendix
Date:     2010-08-20 12:17:39 +0200 (Fri, 20 Aug 2010)

Log Message:
-----------
Fix #23350: flip "both" texture preview order from material-texture to 
texture-material so it corresponds better to the text below.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2010-08-20 10:02:21 UTC (rev 31476)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2010-08-20 10:17:39 UTC (rev 31477)
@@ -548,8 +548,8 @@
 		newrect.ymax= rect->ymin;
 
 		if(parent) {
-			ok = ed_preview_draw_rect(sa, sce, parent, 1, 1, rect, &newrect);
-			ok &= ed_preview_draw_rect(sa, sce, id, 1, 0, rect, &newrect);
+			ok = ed_preview_draw_rect(sa, sce, id, 1, 1, rect, &newrect);
+			ok &= ed_preview_draw_rect(sa, sce, parent, 1, 0, rect, &newrect);
 		}
 		else
 			ok = ed_preview_draw_rect(sa, sce, id, 0, 0, rect, &newrect);
@@ -999,8 +999,8 @@
 	sp->do_update= do_update;
 
 	if(sp->parent) {
-		shader_preview_render(sp, sp->parent, 1, 1);
-		shader_preview_render(sp, sp->id, 1, 0);
+		shader_preview_render(sp, sp->id, 1, 1);
+		shader_preview_render(sp, sp->parent, 1, 0);
 	}
 	else
 		shader_preview_render(sp, sp->id, 0, 0);