[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22441] branches/blender2.5/blender/source /blender/editors/space_view3d/drawobject.c: Smoke: no lamp results in no shading (requested by nudelZ)

Daniel Genrich daniel.genrich at gmx.net
Thu Aug 13 23:29:06 CEST 2009


Revision: 22441
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22441
Author:   genscher
Date:     2009-08-13 23:29:05 +0200 (Thu, 13 Aug 2009)

Log Message:
-----------
Smoke: no lamp results in no shading (requested by nudelZ)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c

Modified: branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c	2009-08-13 20:35:53 UTC (rev 22440)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c	2009-08-13 21:29:05 UTC (rev 22441)
@@ -5351,6 +5351,7 @@
 			float bigfactor = 1.0;
 			int big = (smd->domain->flags & MOD_SMOKE_HIGHRES) && (smd->domain->viewsettings & MOD_SMOKE_VIEW_USEBIG);
 			int new = 0;
+			int have_lamp = 0;
 			
 			// GUI sent redraw event
 			if(smd->domain->flags & MOD_SMOKE_VIEW_REDRAWNICE)
@@ -5439,7 +5440,7 @@
 			
 			if(new > 1)
 			{
-				float light[3] = {0.0,0.0,2.0}; // TODO: take real LAMP coordinates - dg
+				float light[3] = {0.0,0.0,0.0}; // TODO: take real LAMP coordinates - dg
 				Base *base_tmp = NULL;
 
 				for(base_tmp = scene->base.first; base_tmp; base_tmp= base_tmp->next) 
@@ -5451,6 +5452,7 @@
 						if(la->type == LA_LOCAL)
 						{
 							VECCOPY(light, base_tmp->object->obmat[3]);
+							have_lamp = 1;
 							break;
 						}
 					}
@@ -5554,6 +5556,9 @@
 									tvox =  smoke_get_bigtvox(smd, index);
 									tray = smoke_get_bigtray(smd, index);
 								}
+
+								if(!have_lamp)
+									tvox = 1.0;
 								
 								// fill buffer with luminance and alpha
 								// 1 - T_vox





More information about the Bf-blender-cvs mailing list