diff options
| author | Clément Foucault <foucault.clem@gmail.com> | 2018-11-29 00:16:56 +0300 |
|---|---|---|
| committer | Clément Foucault <foucault.clem@gmail.com> | 2018-11-29 23:52:36 +0300 |
| commit | 8f4ab480bfe81f40b59b20780cb452736fe3af1d (patch) | |
| tree | c88bcf3a727c4a63abac40847d4891878102344b /source/blender/draw/engines/workbench/workbench_materials.c | |
| parent | 18c9101acc58428fd02d6877c8b1c1711780826e (diff) | |
Workbench: Rename orientation to type and Camera studio light to Studio
Diffstat (limited to 'source/blender/draw/engines/workbench/workbench_materials.c')
| -rw-r--r-- | source/blender/draw/engines/workbench/workbench_materials.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/draw/engines/workbench/workbench_materials.c b/source/blender/draw/engines/workbench/workbench_materials.c index cf0ed3147d0..42e52e037f3 100644 --- a/source/blender/draw/engines/workbench/workbench_materials.c +++ b/source/blender/draw/engines/workbench/workbench_materials.c @@ -83,14 +83,14 @@ char *workbench_material_build_defines(WORKBENCH_PrivateData *wpd, bool use_text if (MATCAP_ENABLED(wpd)) { BLI_dynstr_appendf(ds, "#define V3D_LIGHTING_MATCAP\n"); } - if (STUDIOLIGHT_ORIENTATION_WORLD_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_ORIENTATION_WORLD\n"); + if (STUDIOLIGHT_TYPE_WORLD_ENABLED(wpd)) { + BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_TYPE_WORLD\n"); } - if (STUDIOLIGHT_ORIENTATION_CAMERA_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_ORIENTATION_CAMERA\n"); + if (STUDIOLIGHT_TYPE_STUDIO_ENABLED(wpd)) { + BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_TYPE_STUDIO\n"); } - if (STUDIOLIGHT_ORIENTATION_VIEWNORMAL_ENABLED(wpd)) { - BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_ORIENTATION_VIEWNORMAL\n"); + if (STUDIOLIGHT_TYPE_MATCAP_ENABLED(wpd)) { + BLI_dynstr_appendf(ds, "#define STUDIOLIGHT_TYPE_MATCAP\n"); } if (NORMAL_VIEWPORT_PASS_ENABLED(wpd)) { BLI_dynstr_appendf(ds, "#define NORMAL_VIEWPORT_PASS_ENABLED\n"); @@ -158,8 +158,8 @@ int workbench_material_get_shader_index(WORKBENCH_PrivateData *wpd, bool use_tex SET_FLAG_FROM_TEST(index, uses_curvature, 1 << 7); SET_FLAG_FROM_TEST(index, uses_curvature && (U.pixelsize > 1.5f), 1 << 8); /* 2 bits STUDIOLIGHT_ORIENTATION */ - SET_FLAG_FROM_TEST(index, wpd->studio_light->flag & STUDIOLIGHT_ORIENTATION_WORLD, 1 << 9); - SET_FLAG_FROM_TEST(index, wpd->studio_light->flag & STUDIOLIGHT_ORIENTATION_VIEWNORMAL, 1 << 10); + SET_FLAG_FROM_TEST(index, wpd->studio_light->flag & STUDIOLIGHT_TYPE_WORLD, 1 << 9); + SET_FLAG_FROM_TEST(index, wpd->studio_light->flag & STUDIOLIGHT_TYPE_MATCAP, 1 << 10); /* 1 bit for hair */ SET_FLAG_FROM_TEST(index, is_hair, 1 << 11); return index; |