[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13402] trunk/blender/source/blender/src: Feature: we're using "non linear lighting" now, using exposure/range in

[Ton Roosendaal]

Revision: 13402
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13402
Author:   ton
Date:     2008-01-25 16:06:35 +0100 (Fri, 25 Jan 2008)

Log Message:
-----------
Feature: we're using "non linear lighting" now, using exposure/range in
world. That allows more extreme lamps (areas too). 

To make it work more intuitive, the preview renders in buttons now use
the settings for exposure too.

Modified Paths:
--------------
    trunk/blender/source/blender/src/buttons_shading.c
    trunk/blender/source/blender/src/previewrender.c

Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c	2008-01-25 11:27:38 UTC (rev 13401)
+++ trunk/blender/source/blender/src/buttons_shading.c	2008-01-25 15:06:35 UTC (rev 13402)
@@ -2283,8 +2283,8 @@
 
 	uiBlockBeginAlign(block);
 	uiBlockSetCol(block, TH_BUT_SETTING1);
-	uiDefButF(block, NUMSLI,B_WORLDPRV, "Exp ",			160,30,145,19,	&(wrld->exp), 0.0, 1.0, 0, 2, "Sets amount of exponential color correction for light");
-	uiDefButF(block, NUMSLI,B_WORLDPRV, "Range ",		160,10,145,19,	&(wrld->range), 0.2, 5.0, 0, 2, "Sets the color amount that will be mapped on color 1.0");
+	uiDefButF(block, NUMSLI,B_WORLDPRV2, "Exp ",			160,30,145,19,	&(wrld->exp), 0.0, 1.0, 0, 2, "Sets amount of exponential color correction for light");
+	uiDefButF(block, NUMSLI,B_WORLDPRV2, "Range ",		160,10,145,19,	&(wrld->range), 0.2, 5.0, 0, 2, "Sets the color amount that will be mapped on color 1.0");
 
 
 }
@@ -2968,7 +2968,7 @@
 		allqueue(REDRAWBUTSSHADING, 0);
 		break;
 	case B_WORLDPRV2:
-		BIF_preview_changed(ID_WO);
+		BIF_preview_changed(ID_TE);
 		allqueue(REDRAWBUTSSHADING, 0);
 		allqueue(REDRAWVIEW3D, 0);
 		break;

Modified: trunk/blender/source/blender/src/previewrender.c
===================================================================
--- trunk/blender/source/blender/src/previewrender.c	2008-01-25 11:27:38 UTC (rev 13401)
+++ trunk/blender/source/blender/src/previewrender.c	2008-01-25 15:06:35 UTC (rev 13402)
@@ -270,6 +270,11 @@
 		sce->r.scemode |= R_PREVIEWBUTS;
 		/* set world always back, is used now */
 		sce->world= pr_main->world.first;
+		/* now: exposure copy */
+		if(G.scene->world) {
+			sce->world->exp= G.scene->world->exp;
+			sce->world->range= G.scene->world->range;
+		}
 		
 		sce->r.cfra= G.scene->r.cfra;