[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12052] trunk/blender/source/blender/src/ buttons_shading.c: Bugfix #7360:
Joshua Leung
aligorith at gmail.com
Mon Sep 17 07:00:37 CEST 2007
Revision: 12052
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12052
Author: aligorith
Date: 2007-09-17 07:00:36 +0200 (Mon, 17 Sep 2007)
Log Message:
-----------
Bugfix #7360:
In svn-trunk, deleting a lamp crashed when the Lamp Buttons were active. Also, removed and old duplicate variable.
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_shading.c
Modified: trunk/blender/source/blender/src/buttons_shading.c
===================================================================
--- trunk/blender/source/blender/src/buttons_shading.c 2007-09-17 04:46:58 UTC (rev 12051)
+++ trunk/blender/source/blender/src/buttons_shading.c 2007-09-17 05:00:36 UTC (rev 12052)
@@ -4023,9 +4023,10 @@
void lamp_panels()
{
Object *ob= OBACT;
- Lamp *la = ob->data;
+ Lamp *la;
if(ob==NULL || ob->type!= OB_LAMP) return;
+ la= ob->data;
lamp_panel_preview(ob, ob->data);
lamp_panel_lamp(ob, ob->data);
@@ -4038,14 +4039,13 @@
lamp_panel_spot(ob, ob->data);
else {
/* init vars */
- Lamp* lp = ob->data;
- if (lp->YF_numphotons==0) lp->YF_numphotons=1000;
- if (lp->YF_numsearch==0) lp->YF_numsearch=10;
- if (lp->YF_phdepth==0) lp->YF_phdepth=1;
- if (lp->YF_causticblur==0.0) lp->YF_causticblur=0.001;
- if (lp->YF_bufsize==0) lp->YF_bufsize=128;
+ if (la->YF_numphotons==0) la->YF_numphotons=1000;
+ if (la->YF_numsearch==0) la->YF_numsearch=10;
+ if (la->YF_phdepth==0) la->YF_phdepth=1;
+ if (la->YF_causticblur==0.0) la->YF_causticblur=0.001;
+ if (la->YF_bufsize==0) la->YF_bufsize=128;
/* spherelight radius default is zero, so nothing to do */
- lamp_panel_yafray(ob, lp);
+ lamp_panel_yafray(ob, la);
}
lamp_panel_texture(ob, ob->data);
lamp_panel_mapto(ob, ob->data);
More information about the Bf-blender-cvs
mailing list