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/editors | |
| 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/editors')
| -rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index 883722105ee..5e9d6f4ea1c 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -333,8 +333,8 @@ static SpaceLink *view3d_new(const bContext *C) v3d->gridlines = 16; v3d->gridsubdiv = 10; v3d->drawtype = OB_SOLID; - v3d->drawtype_solid = OB_LIGHTING_STUDIO; - v3d->drawtype_texture = OB_LIGHTING_STUDIO; + v3d->drawtype_solid = V3D_LIGHTING_STUDIO; + v3d->drawtype_texture = V3D_LIGHTING_STUDIO; v3d->gridflag = V3D_SHOW_X | V3D_SHOW_Y | V3D_SHOW_FLOOR; |