archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Objects: Remove Textured from object display type

Browse Source 
As discussed with @billreynish this makes little sense now that we don't
have a dedicated textured mode. We don't have a superior texture or shaded
mode anymore and we also cannot mix different engines together (workbench
with eevee/lookdev).

The only feature it removes is the possibility to hide textures for certain
object in solid mode.
This commit is contained in:
Clément Foucault
2019-02-28 15:29:04 +01:00
parent cd897c57f8
commit 6a4a984ff7
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/object.c
View File

@@ -832,7 +832,7 @@ void BKE_object_init(Object *ob)
unit_m4(ob->constinv);
unit_m4(ob->parentinv);
unit_m4(ob->obmat);
ob->dt = OB_TEXTURE;
ob->dt = OB_SOLID;
ob->empty_drawtype = OB_PLAINAXES;
ob->empty_drawsize = 1.0;
ob->empty_image_depth = OB_EMPTY_IMAGE_DEPTH_DEFAULT;

8
source/blender/blenloader/intern/versioning_280.c
View File

@@ -2825,5 +2825,13 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
}
{
for (Object *ob = bmain->object.first; ob; ob = ob->id.next) {
/* texture mode disabled for now */
if (ob->dt > OB_SOLID)
ob->dt = OB_SOLID;
}
}
}
}

4
source/blender/draw/engines/workbench/workbench_materials.c
View File

@@ -211,10 +211,10 @@ int workbench_material_get_accum_shader_index(WORKBENCH_PrivateData *wpd, bool u
return index;
}
int workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, Image *ima, Object *ob)
int workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, Image *ima, Object *UNUSED(ob))
{
int color_type = wpd->shading.color_type;
if ((color_type == V3D_SHADING_TEXTURE_COLOR && ima == NULL) || (ob->dt < OB_TEXTURE)) {
if (color_type == V3D_SHADING_TEXTURE_COLOR && ima == NULL) {
color_type = V3D_SHADING_MATERIAL_COLOR;
}
return color_type;

2
source/blender/makesrna/intern/rna_object.c
View File

@@ -2108,8 +2108,6 @@ static void rna_def_object(BlenderRNA *brna)
{OB_BOUNDBOX, "BOUNDS", 0, "Bounds", "Display the bounds of the object"},
{OB_WIRE, "WIRE", 0, "Wire", "Display the object as a wireframe"},
{OB_SOLID, "SOLID", 0, "Solid", "Display the object as a solid (if solid drawing is enabled in the viewport)"},
{OB_TEXTURE, "TEXTURED", 0, "Textured",
"Display the object with textures (if textures are enabled in the viewport)"},
{0, NULL, 0, NULL, NULL},
};