diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-19 10:45:52 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-19 10:45:52 +0300 |
| commit | 16fac020e07d7ad0caa5901c0740c88e9772194f (patch) | |
| tree | 505cf49b33f2ce6d8edae69b7355ca1ea092aca9 /source/blender/blenloader/intern | |
| parent | 1f5d51e44ecf99f34d8e733559a9312e5ae3ef33 (diff) | |
Workbench: Option to use Object color
- added `object_color_type` where the user can set if the collection
determines the color, or the object will be used for the color.
Implemented it as an enum as later this can have a random color option.
- moved OB_LIGHTING_* to DNA_view3d_types and renamed it.
- Fixed some DRY in workbench_materials.c. Can remove more DRY's but
will need to discuss the responsibility of the workbench engine as it
might become part of the eevee renderer.
Diffstat (limited to 'source/blender/blenloader/intern')
| -rw-r--r-- | source/blender/blenloader/intern/versioning_280.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c index b2bb2fd792b..d6cf411c31c 100644 --- a/source/blender/blenloader/intern/versioning_280.c +++ b/source/blender/blenloader/intern/versioning_280.c @@ -913,8 +913,8 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *main) for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) { if (sl->spacetype == SPACE_VIEW3D) { View3D *v3d = (View3D *)sl; - v3d->drawtype_solid = OB_LIGHTING_STUDIO; - v3d->drawtype_wireframe = OB_LIGHTING_STUDIO; + v3d->drawtype_solid = V3D_LIGHTING_STUDIO; + v3d->drawtype_wireframe = V3D_LIGHTING_STUDIO; /* Assume (demo) files written with 2.8 want to show * Eevee renders in the viewport. */ |