blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Cleanup: codestyle

This commit is contained in:
Campbell Barton 2018-06-17 12:03:22 +02:00
parent 43ce201125
commit ab20901c9e
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/gawain/CMakeLists.txt
View File

@ -1,5 +1,5 @@
# WITH_OPENGL limits the visibility of the opengl headers to just gawain and bg_gpu,
# to more easily highlight codepadths in other libraries that need to be refactored,
# to more easily highlight codepadths in other libraries that need to be refactored,
# bf_intern_gawain is allowed to have opengl regardless of this option.
if(NOT WITH_OPENGL)

4
source/blender/blenkernel/intern/studiolight.c
View File

@ -633,7 +633,7 @@ static uint *studiolight_radiance_preview(StudioLight *sl, int icon_size)
normal[0] = dx * 2.0f - 1.0f;
normal[1] = dy * 2.0f - 1.0f;
float dist = len_v2(normal);
normal[2] = sqrtf(1.0f - dist*dist);
normal[2] = sqrtf(1.0f - SQUARE(dist));
float direction[3];
reflect_v3_v3v3(direction, incoming, normal);
@ -717,7 +717,7 @@ static uint *studiolight_irradiance_preview(StudioLight *sl, int icon_size)
normal[0] = dx * 2.0f - 1.0f;
normal[1] = dy * 2.0f - 1.0f;
float dist = len_v2(normal);
normal[2] = sqrtf(1.0f - dist*dist);
normal[2] = sqrtf(1.0f - SQUARE(dist));
float color[3];
mul_v3_v3fl(color, sl->diffuse_light[STUDIOLIGHT_X_POS], clamp_f(normal[0], 0.0, 1.0));

2
source/blender/draw/engines/eevee/shaders/lit_surface_frag.glsl
View File

@ -374,7 +374,7 @@ void CLOSURE_NAME(
accumulate_light(trans, 1.0, refr_accum);
}
#endif
#endif /* Specular probes */
#endif /* Specular probes */
/* ---------------------------- */

2
source/blender/draw/engines/workbench/workbench_deferred.c
View File

@ -423,7 +423,7 @@ void workbench_deferred_engine_init(WORKBENCH_Data *vedata)
DRW_shgroup_uniform_block(grp, "samples_block", e_data.sampling_ubo);
DRW_shgroup_call_add(grp, DRW_cache_fullscreen_quad_get(), NULL);
}
{
psl->effect_fxaa_pass = DRW_pass_create("Effect FXAA", DRW_STATE_WRITE_COLOR);
DRWShadingGroup *grp = DRW_shgroup_create(e_data.effect_fxaa_sh, psl->effect_fxaa_pass);

2
source/blender/draw/modes/shaders/edit_mesh_overlay_common_lib.glsl
View File

@ -52,4 +52,4 @@ vec4 EDIT_MESH_vertex_color(int vertex_flag)
return colorWireInactive;
#endif
}
}
}

2
source/blender/gpu/CMakeLists.txt
View File

@ -24,7 +24,7 @@
# ***** END GPL LICENSE BLOCK *****
# WITH_OPENGL limits the visibility of the opengl headers to just gawain and bg_gpu,
# to more easily highlight codepadths in other libraries that need to be refactored,
# to more easily highlight codepadths in other libraries that need to be refactored,
# bf_gpu is allowed to have opengl regardless of this option.
if(NOT WITH_OPENGL)