Commit: 69e9927b6c82cc599c197640822717064a74bc6c
Author: Bastien Montagne
Date: Sat Nov 30 22:05:38 2013 +0100
http://developer.blender.org/rB69e9927b6c82cc599c197640822717064a74bc6c
Cleanup: remove deprecated old Lamp.shadspotsize from code.
Was not used anymore, except in Collada import/export, but without any
conversion code.
Suggested by Brecht in comments of D59.
===================================================================
M source/blender/blenkernel/intern/lamp.c
M source/blender/collada/DocumentImporter.cpp
M source/blender/collada/LightExporter.cpp
M source/blender/makesdna/DNA_lamp_types.h
===================================================================
diff --git a/source/blender/blenkernel/intern/lamp.c
b/source/blender/blenkernel/intern/lamp.c
index 903b032..2bd521a 100644
--- a/source/blender/blenkernel/intern/lamp.c
+++ b/source/blender/blenkernel/intern/lamp.c
@@ -70,7 +70,6 @@ Lamp *BKE_lamp_add(Main *bmain, const char *name)
la->bufsize = 512;
la->clipsta = 0.5f;
la->clipend = 40.0f;
- la->shadspotsize = 45.0f;
la->samp = 3;
la->bias = 1.0f;
la->soft = 3.0f;
diff --git a/source/blender/collada/DocumentImporter.cpp
b/source/blender/collada/DocumentImporter.cpp
index 79c7251..9877067 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -1134,7 +1134,6 @@ bool DocumentImporter::writeLight(const COLLADAFW::Light
*light)
et->setData("falloff_type", &(lamp->falloff_type));
et->setData("clipsta", &(lamp->clipsta));
et->setData("clipend", &(lamp->clipend));
- et->setData("shadspotsize", &(lamp->shadspotsize));
et->setData("bias", &(lamp->bias));
et->setData("soft", &(lamp->soft));
et->setData("compressthresh", &(lamp->compressthresh));
diff --git a/source/blender/collada/LightExporter.cpp
b/source/blender/collada/LightExporter.cpp
index af13d61..a277963 100644
--- a/source/blender/collada/LightExporter.cpp
+++ b/source/blender/collada/LightExporter.cpp
@@ -156,7 +156,6 @@ bool LightsExporter::exportBlenderProfile(COLLADASW::Light
&cla, Lamp *la)
cla.addExtraTechniqueParameter("blender", "falloff_type",
la->falloff_type);
cla.addExtraTechniqueParameter("blender", "clipsta", la->clipsta);
cla.addExtraTechniqueParameter("blender", "clipend", la->clipend);
- cla.addExtraTechniqueParameter("blender", "shadspotsize",
la->shadspotsize);
cla.addExtraTechniqueParameter("blender", "bias", la->bias);
cla.addExtraTechniqueParameter("blender", "soft", la->soft);
cla.addExtraTechniqueParameter("blender", "compressthresh",
la->compressthresh);
diff --git a/source/blender/makesdna/DNA_lamp_types.h
b/source/blender/makesdna/DNA_lamp_types.h
index a1b3d42..b7aae00 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -65,8 +65,8 @@ typedef struct Lamp {
short falloff_type;
short pad2;
- float clipsta, clipend, shadspotsize;
- float bias, soft, compressthresh, bleedbias, pad5[2];
+ float clipsta, clipend;
+ float bias, soft, compressthresh, bleedbias, pad5;
short bufsize, samp, buffers, filtertype;
char bufflag, buftype;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
