Commit: 22fec7b1a4affb2e1261508db54d63b1ffcc37c7 Author: Germano Cavalcante Date: Wed Jan 4 11:22:57 2023 -0300 Branches: master https://developer.blender.org/rB22fec7b1a4affb2e1261508db54d63b1ffcc37c7
Remove deprecated and long unused members of struct Light The members `soft`, `bleedbias`, `bleedexp` and `contact_spread` were deprecated in rBd8aaf25c23fa, and are no longer really used. `soft` is only used by Collada as an extra value for exporting and importing Blender files in collada. `bleedexp` and `contact_spread` are only used in versioning to initialize a default value. Reviewed By: brecht, fclem Differential Revision: https://developer.blender.org/D16834 =================================================================== M source/blender/blenloader/intern/versioning_280.c M source/blender/io/collada/DocumentImporter.cpp M source/blender/io/collada/LightExporter.cpp M source/blender/makesdna/DNA_light_defaults.h M source/blender/makesdna/DNA_light_types.h =================================================================== diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index ffb87949234..09292841e91 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -1782,12 +1782,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) } if (!MAIN_VERSION_ATLEAST(bmain, 280, 1)) { - if (!DNA_struct_elem_find(fd->filesdna, "Lamp", "float", "bleedexp")) { - for (Light *la = bmain->lights.first; la; la = la->id.next) { - la->bleedexp = 2.5f; - } - } - if (!DNA_struct_elem_find(fd->filesdna, "GPUDOFSettings", "float", "ratio")) { for (Camera *ca = bmain->cameras.first; ca; ca = ca->id.next) { ca->gpu_dof.ratio = 1.0f; @@ -1820,7 +1814,6 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain) for (Light *la = bmain->lights.first; la; la = la->id.next) { la->contact_dist = 0.2f; la->contact_bias = 0.03f; - la->contact_spread = 0.2f; la->contact_thickness = 0.2f; } } diff --git a/source/blender/io/collada/DocumentImporter.cpp b/source/blender/io/collada/DocumentImporter.cpp index dae1c4ba894..51744953491 100644 --- a/source/blender/io/collada/DocumentImporter.cpp +++ b/source/blender/io/collada/DocumentImporter.cpp @@ -1017,7 +1017,6 @@ bool DocumentImporter::writeLight(const COLLADAFW::Light *light) et->setData("clipsta", &(lamp->clipsta)); et->setData("clipend", &(lamp->clipend)); et->setData("bias", &(lamp->bias)); - et->setData("soft", &(lamp->soft)); et->setData("bufsize", &(lamp->bufsize)); et->setData("buffers", &(lamp->buffers)); et->setData("area_shape", &(lamp->area_shape)); diff --git a/source/blender/io/collada/LightExporter.cpp b/source/blender/io/collada/LightExporter.cpp index 33c041e790f..b5f9b56ba7c 100644 --- a/source/blender/io/collada/LightExporter.cpp +++ b/source/blender/io/collada/LightExporter.cpp @@ -129,7 +129,6 @@ bool LightsExporter::exportBlenderProfile(COLLADASW::Light &cla, Light *la) cla.addExtraTechniqueParameter("blender", "clipsta", la->clipsta); cla.addExtraTechniqueParameter("blender", "clipend", la->clipend); cla.addExtraTechniqueParameter("blender", "bias", la->bias); - cla.addExtraTechniqueParameter("blender", "soft", la->soft); cla.addExtraTechniqueParameter("blender", "bufsize", la->bufsize); cla.addExtraTechniqueParameter("blender", "samp", la->samp); cla.addExtraTechniqueParameter("blender", "buffers", la->buffers); diff --git a/source/blender/makesdna/DNA_light_defaults.h b/source/blender/makesdna/DNA_light_defaults.h index 7b03a51a727..b2cb7cfd686 100644 --- a/source/blender/makesdna/DNA_light_defaults.h +++ b/source/blender/makesdna/DNA_light_defaults.h @@ -28,10 +28,8 @@ .bufsize = 512, \ .clipsta = 0.05f, \ .clipend = 40.0f, \ - .bleedexp = 2.5f, \ .samp = 3, \ .bias = 1.0f, \ - .soft = 3.0f, \ .area_size = 0.25f, \ .area_sizey = 0.25f, \ .area_sizez = 0.25f, \ @@ -47,7 +45,6 @@ .cascade_fade = 0.1f, \ .contact_dist = 0.2f, \ .contact_bias = 0.03f, \ - .contact_spread = 0.2f, \ .contact_thickness = 0.2f, \ .diff_fac = 1.0f, \ .spec_fac = 1.0f, \ diff --git a/source/blender/makesdna/DNA_light_types.h b/source/blender/makesdna/DNA_light_types.h index f1bf0580b94..86042369539 100644 --- a/source/blender/makesdna/DNA_light_types.h +++ b/source/blender/makesdna/DNA_light_types.h @@ -48,9 +48,7 @@ typedef struct Light { float clipsta, clipend; float bias; - float soft; /* DEPRECATED kept for compatibility. */ - float bleedbias; /* DEPRECATED kept for compatibility. */ - float bleedexp; /* DEPRECATED kept for compatibility. */ + char _pad1[4]; short bufsize, samp, buffers, filtertype; char bufflag, buftype; @@ -66,7 +64,6 @@ typedef struct Light { /** Old animation system, deprecated for 2.5. */ struct Ipo *ipo DNA_DEPRECATED; short pr_texture, use_nodes; - char _pad6[4]; /* Eevee */ float cascade_max_dist; @@ -76,7 +73,6 @@ typedef struct Light { float contact_dist; float contact_bias; - float contact_spread; /* DEPRECATED kept for compatibility. */ float contact_thickness; float diff_fac, volume_fac; _______________________________________________ Bf-blender-cvs mailing list [email protected] List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs
