diff options
author | Clément Foucault <foucault.clem@gmail.com> | 2019-02-28 18:51:10 +0300 |
---|---|---|
committer | Clément Foucault <foucault.clem@gmail.com> | 2019-02-28 18:51:24 +0300 |
commit | ac8c4aad302f9671b3126f25c619b6be97a2a547 (patch) | |
tree | c50ad1a5c922fb09efa14a34cb98221a10227222 /source | |
parent | 846d265a06e39c86574cba6722495b6373596c7a (diff) |
Revert "Objects: Remove Textured from object display type"
This reverts commit 6a4a984ff731070d0702821fe1e67dea40e593b9.
Diffstat (limited to 'source')
4 files changed, 5 insertions, 11 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index b397ab39c94..1b4aad16778 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -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_SOLID; + ob->dt = OB_TEXTURE; ob->empty_drawtype = OB_PLAINAXES; ob->empty_drawsize = 1.0; ob->empty_image_depth = OB_EMPTY_IMAGE_DEPTH_DEFAULT; diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index c9350917204..89525cdde21 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -2825,13 +2825,5 @@ 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; - } - } } } diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index fc1fa646881..e721a4ccdb8 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -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 *UNUSED(ob)) +int workbench_material_determine_color_type(WORKBENCH_PrivateData *wpd, Image *ima, Object *ob) { int color_type = wpd->shading.color_type; - if (color_type == V3D_SHADING_TEXTURE_COLOR && ima == NULL) { + if ((color_type == V3D_SHADING_TEXTURE_COLOR && ima == NULL) || (ob->dt < OB_TEXTURE)) { color_type = V3D_SHADING_MATERIAL_COLOR; } return color_type; diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c index fef8db10e1d..a70c8a23f3c 100644 --- a/source/blender/makesrna/intern/rna_object.c +++ b/source/blender/makesrna/intern/rna_object.c @@ -2108,6 +2108,8 @@ 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}, }; |