griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: RNA naming, use highlight as suffux

Browse Source 
This is whats done already elsewhere.
This commit is contained in:
Campbell Barton
2018-05-30 15:32:08 +02:00
parent d0d2fc9819
commit 375c1eab65
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -3528,7 +3528,7 @@ class VIEW3D_PT_shading(Panel):
col.row().prop(shading, "studiolight_rot_z")
row = col.row()
row.prop(shading, "show_specular_highlights")
row.prop(shading, "show_specular_highlight")
col.separator()

2
source/blender/blenloader/intern/versioning_280.c
View File

@@ -1505,7 +1505,7 @@ 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->shading.flag |= V3D_SHADING_SPECULAR_HIGHLIGHTS;
v3d->shading.flag |= V3D_SHADING_SPECULAR_HIGHLIGHT;
}
}
}

6
source/blender/draw/engines/workbench/shaders/workbench_world_light_lib.glsl
View File

@@ -22,15 +22,15 @@ vec3 get_camera_diffuse_light(WorldData world_data, vec3 N)
/* N And I are in View Space. */
vec3 get_world_specular_light(WorldData world_data, vec3 N, vec3 I)
{
#ifdef V3D_SHADING_SPECULAR_HIGHLIGHTS
#ifdef V3D_SHADING_SPECULAR_HIGHLIGHT
vec3 reflection_vector = reflect(I, N);
vec3 specular_light = vec3(1.0);
/* Simple frontal specular highlights. */
float specular_influence = pow(max(0.0, dot(world_data.light_direction_vs.xyz, reflection_vector)), world_data.specular_sharpness);
vec3 specular_color = specular_light * specular_influence;
#else /* V3D_SHADING_SPECULAR_HIGHLIGHTS */
#else /* V3D_SHADING_SPECULAR_HIGHLIGHT */
vec3 specular_color = vec3(0.0);
#endif /* V3D_SHADING_SPECULAR_HIGHLIGHTS */
#endif /* V3D_SHADING_SPECULAR_HIGHLIGHT */
return specular_color;
}

6
source/blender/draw/engines/workbench/workbench_materials.c
View File

@@ -52,8 +52,8 @@ char *workbench_material_build_defines(WORKBENCH_PrivateData *wpd, int drawtype)
if (wpd->shading.flag & V3D_SHADING_SHADOW) {
BLI_dynstr_appendf(ds, "#define V3D_SHADING_SHADOW\n");
}
if (wpd->shading.flag & V3D_SHADING_SPECULAR_HIGHLIGHTS) {
BLI_dynstr_appendf(ds, "#define V3D_SHADING_SPECULAR_HIGHLIGHTS\n");
if (wpd->shading.flag & V3D_SHADING_SPECULAR_HIGHLIGHT) {
BLI_dynstr_appendf(ds, "#define V3D_SHADING_SPECULAR_HIGHLIGHT\n");
}
if (wpd->shading.light & V3D_LIGHTING_STUDIO) {
BLI_dynstr_appendf(ds, "#define V3D_LIGHTING_STUDIO\n");
@@ -110,7 +110,7 @@ uint workbench_material_get_hash(WORKBENCH_MaterialData *material_template)
int workbench_material_get_shader_index(WORKBENCH_PrivateData *wpd, int drawtype)
{
const int DRAWOPTIONS_MASK = V3D_SHADING_OBJECT_OUTLINE | V3D_SHADING_SHADOW | V3D_SHADING_SPECULAR_HIGHLIGHTS;
const int DRAWOPTIONS_MASK = V3D_SHADING_OBJECT_OUTLINE | V3D_SHADING_SHADOW | V3D_SHADING_SPECULAR_HIGHLIGHT;
int index = (wpd->shading.flag & DRAWOPTIONS_MASK);
index = (index << 2) + wpd->shading.light;
index = (index << 2);

2
source/blender/editors/space_view3d/space_view3d.c
View File

@@ -323,7 +323,7 @@ static SpaceLink *view3d_new(const ScrArea *UNUSED(sa), const Scene *scene)
v3d->gridlines = 16;
v3d->gridsubdiv = 10;
v3d->drawtype = OB_SOLID;
v3d->shading.flag = V3D_SHADING_SPECULAR_HIGHLIGHTS;
v3d->shading.flag = V3D_SHADING_SPECULAR_HIGHLIGHT;
v3d->shading.light = V3D_LIGHTING_STUDIO;
v3d->shading.shadow_intensity = 0.5;
copy_v3_fl(v3d->shading.single_color, 0.8f);

2
source/blender/makesdna/DNA_view3d_types.h
View File

@@ -341,7 +341,7 @@ enum {
V3D_SHADING_XRAY = (1 << 1),
V3D_SHADING_SHADOW = (1 << 2),
V3D_SHADING_SCENE_LIGHT = (1 << 3),
V3D_SHADING_SPECULAR_HIGHLIGHTS = (1 << 4),
V3D_SHADING_SPECULAR_HIGHLIGHT = (1 << 4),
};
/* View3DShading->single_color_type */

4
source/blender/makesrna/intern/rna_space.c
View File

@@ -2342,8 +2342,8 @@ static void rna_def_space_view3d_shading(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Scene Light", "Render lamps and light probes of the scene");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);
prop = RNA_def_property(srna, "show_specular_highlights", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "shading.flag", V3D_SHADING_SPECULAR_HIGHLIGHTS);
prop = RNA_def_property(srna, "show_specular_highlight", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "shading.flag", V3D_SHADING_SPECULAR_HIGHLIGHT);
RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
RNA_def_property_ui_text(prop, "Specular Highlights", "Render specular highlights");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL);