* New feature on compo scale node: "Scene Size %"

This option sets the relative scaling factor to the amount set in the 
scene "100%/75%/50%/25%" buttons. It's useful when you've got a fixed 
background image, and want to do preview renders at a lesser 
percentage, so you don't have to go and change the scale node each 
time you change the %.

Also removed unnecessary use of a global from texture node.

1 files changed, 3 insertions, 2 deletions

diff --git a/source/blender/nodes/intern/CMP_nodes/CMP_texture.c b/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
index 4ddab661627..31afe74bd11 100644
--- a/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
+++ b/source/blender/nodes/intern/CMP_nodes/CMP_texture.c
@@ -89,6 +89,7 @@ static void node_composit_exec_texture(void *data, bNode *node, bNodeStack **in,
 	/* outputs: value, color, normal */
 	
 	if(node->id) {
+		RenderData *rd= data;
 		RenderResult *rr= RE_GetResult(RE_GetRender(G.scene->id.name)); /* G.scene is WEAK! */
 		short sizex, sizey;
 		
@@ -99,8 +100,8 @@ static void node_composit_exec_texture(void *data, bNode *node, bNodeStack **in,
 			sizex = rr->rectx;
 			sizey = rr->recty;
 		} else {
-			sizex = G.scene->r.xsch;
-			sizey = G.scene->r.ysch;
+			sizex = rd->xsch;
+			sizey = rd->ysch;
 		}
 		
 		prevbuf->rect_procedural= texture_procedural;