Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-18 12:32:52 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-05-18 12:42:31 +0300
commit07c67148e36d95ac185c553ceacbdb6896ae46ca (patch)
treeb97cb7907aae1f5d9061b38fe867bb54a689ad79 /source/blender
parentd95ccc21758983e3ec2800285fb7fd2aed807189 (diff)
Mesh: remove Double Sided lighting option, it does nothing in the new viewport
This is legacy option from fixed-function graphics hardware, where per-vertex lighting meant this had a significant performance impact.
Diffstat (limited to 'source/blender')
-rw-r--r--source/blender/collada/EffectExporter.cpp11
-rw-r--r--source/blender/collada/GeometryExporter.cpp10
-rw-r--r--source/blender/makesdna/DNA_mesh_types.h10
-rw-r--r--source/blender/makesrna/intern/rna_mesh.c6
4 files changed, 5 insertions, 32 deletions
diff --git a/source/blender/collada/EffectExporter.cpp b/source/blender/collada/EffectExporter.cpp
index 279113f46d9..a6e75ba41a9 100644
--- a/source/blender/collada/EffectExporter.cpp
+++ b/source/blender/collada/EffectExporter.cpp
@@ -243,20 +243,9 @@ void EffectsExporter::operator()(Material *ma, Object *ob)
// performs the actual writing
ep.addProfileElements();
- bool twoSided = false;
- if (ob->type == OB_MESH && ob->data) {
- Mesh *me = (Mesh *)ob->data;
- if (me->flag & ME_TWOSIDED)
- twoSided = true;
- }
- if (twoSided)
- ep.addExtraTechniqueParameter("GOOGLEEARTH", "double_sided", 1);
ep.addExtraTechniques(mSW);
ep.closeProfile();
- if (twoSided)
- mSW->appendTextBlock(
- "<extra><technique profile=\"MAX3D\"><double_sided>1</double_sided></technique></extra>");
closeEffect();
}
diff --git a/source/blender/collada/GeometryExporter.cpp b/source/blender/collada/GeometryExporter.cpp
index f9279538742..bda6fec70a8 100644
--- a/source/blender/collada/GeometryExporter.cpp
+++ b/source/blender/collada/GeometryExporter.cpp
@@ -126,11 +126,6 @@ void GeometryExporter::operator()(Object *ob)
closeMesh();
- if (me->flag & ME_TWOSIDED) {
- mSW->appendTextBlock(
- "<extra><technique profile=\"MAYA\"><double_sided>1</double_sided></technique></extra>");
- }
-
closeGeometry();
if (this->export_settings->include_shapekeys) {
@@ -211,11 +206,6 @@ void GeometryExporter::export_key_mesh(Object *ob, Mesh *me, KeyBlock *kb)
closeMesh();
- if (me->flag & ME_TWOSIDED) {
- mSW->appendTextBlock(
- "<extra><technique profile=\"MAYA\"><double_sided>1</double_sided></technique></extra>");
- }
-
closeGeometry();
}
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index 8f08b212d6d..f54c178f1d0 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -233,11 +233,11 @@ enum {
/* me->flag */
enum {
- ME_FLAG_UNUSED_0 = 1 << 0, /* cleared */
- ME_FLAG_UNUSED_1 = 1 << 1, /* cleared */
- ME_TWOSIDED = 1 << 2,
- ME_FLAG_UNUSED_3 = 1 << 3, /* cleared */
- ME_FLAG_UNUSED_4 = 1 << 4, /* cleared */
+ ME_FLAG_UNUSED_0 = 1 << 0, /* cleared */
+ ME_FLAG_UNUSED_1 = 1 << 1, /* cleared */
+ ME_FLAG_DEPRECATED_2 = 1 << 2, /* deprecated */
+ ME_FLAG_UNUSED_3 = 1 << 3, /* cleared */
+ ME_FLAG_UNUSED_4 = 1 << 4, /* cleared */
ME_AUTOSMOOTH = 1 << 5,
ME_FLAG_UNUSED_6 = 1 << 6, /* cleared */
ME_FLAG_UNUSED_7 = 1 << 7, /* cleared */
diff --git a/source/blender/makesrna/intern/rna_mesh.c b/source/blender/makesrna/intern/rna_mesh.c
index 0b4056121b3..4082222340a 100644
--- a/source/blender/makesrna/intern/rna_mesh.c
+++ b/source/blender/makesrna/intern/rna_mesh.c
@@ -3015,12 +3015,6 @@ static void rna_def_mesh(BlenderRNA *brna)
RNA_def_property_boolean_funcs(prop, "rna_Mesh_has_custom_normals_get", NULL);
RNA_define_verify_sdna(true);
- prop = RNA_def_property(srna, "show_double_sided", PROP_BOOLEAN, PROP_NONE);
- RNA_def_property_boolean_sdna(prop, NULL, "flag", ME_TWOSIDED);
- RNA_def_property_ui_text(
- prop, "Double Sided", "Display the mesh with double or single sided lighting (OpenGL only)");
- RNA_def_property_update(prop, 0, "rna_Mesh_update_data");
-
prop = RNA_def_property(srna, "texco_mesh", PROP_POINTER, PROP_NONE);
RNA_def_property_pointer_sdna(prop, NULL, "texcomesh");
RNA_def_property_flag(prop, PROP_EDITABLE);