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/makesrna/intern/rna_space.c | |
| parent | 18c9101acc58428fd02d6877c8b1c1711780826e (diff) | |
Workbench: Rename orientation to type and Camera studio light to Studio
Diffstat (limited to 'source/blender/makesrna/intern/rna_space.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_space.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c index 981aac18894..fd6e7436351 100644 --- a/source/blender/makesrna/intern/rna_space.c +++ b/source/blender/makesrna/intern/rna_space.c @@ -807,7 +807,7 @@ static int rna_View3DShading_studio_light_get(PointerRNA *ptr) int flag = STUDIOLIGHT_ORIENTATIONS_SOLID; if (shading->type == OB_SOLID && shading->light == V3D_LIGHTING_MATCAP) { - flag = STUDIOLIGHT_ORIENTATION_VIEWNORMAL; + flag = STUDIOLIGHT_TYPE_MATCAP; dna_storage = shading->matcap; } else if (shading->type == OB_MATERIAL) { @@ -830,7 +830,7 @@ static void rna_View3DShading_studio_light_set(PointerRNA *ptr, int value) int flag = STUDIOLIGHT_ORIENTATIONS_SOLID; if (shading->type == OB_SOLID && shading->light == V3D_LIGHTING_MATCAP) { - flag = STUDIOLIGHT_ORIENTATION_VIEWNORMAL; + flag = STUDIOLIGHT_TYPE_MATCAP; dna_storage = shading->matcap; } else if (shading->type == OB_MATERIAL) { @@ -851,7 +851,7 @@ static const EnumPropertyItem *rna_View3DShading_studio_light_itemf( int totitem = 0; if (shading->type == OB_SOLID && shading->light == V3D_LIGHTING_MATCAP) { - const int flags = (STUDIOLIGHT_EXTERNAL_FILE | STUDIOLIGHT_ORIENTATION_VIEWNORMAL); + const int flags = (STUDIOLIGHT_EXTERNAL_FILE | STUDIOLIGHT_TYPE_MATCAP); LISTBASE_FOREACH(StudioLight *, sl, BKE_studiolight_listbase()) { int icon_id = (shading->flag & V3D_SHADING_MATCAP_FLIP_X) ? sl->icon_id_matcap_flipped: sl->icon_id_matcap; @@ -877,11 +877,11 @@ static const EnumPropertyItem *rna_View3DShading_studio_light_itemf( case OB_SOLID: case OB_TEXTURE: show_studiolight = ( - (sl->flag & (STUDIOLIGHT_ORIENTATION_WORLD | STUDIOLIGHT_ORIENTATION_CAMERA)) != 0); + (sl->flag & (STUDIOLIGHT_TYPE_WORLD | STUDIOLIGHT_TYPE_STUDIO)) != 0); break; case OB_MATERIAL: - show_studiolight = ((sl->flag & STUDIOLIGHT_ORIENTATION_WORLD) != 0); + show_studiolight = ((sl->flag & STUDIOLIGHT_TYPE_WORLD) != 0); icon_id = sl->icon_id_radiance; break; } |