sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton 2016-03-23 04:47:16 +11:00
parent c31c53983e
commit b0a7e77700
3 changed files with 16 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/library.c
View File

@ -194,8 +194,10 @@ void id_us_clear_real(ID *id)
} }
} }
/* Same as \a id_us_plus, but does not handle lib indirect -> extern. /**
* Only used by readfile.c so far, but simpler/safer to keep it here nontheless. */ * Same as \a id_us_plus, but does not handle lib indirect -> extern.
* Only used by readfile.c so far, but simpler/safer to keep it here nonetheless.
*/
void id_us_plus_no_lib(ID *id) void id_us_plus_no_lib(ID *id)
{ {
if (id) { if (id) {

33
source/blender/gpu/intern/gpu_compositing.c
View File

@ -61,8 +61,7 @@ static const float fullscreenuvs[4][2] = {{0.0f, 0.0f}, {1.0f, 0.0f}, {0.0f, 1.0
/* shader interfaces (legacy GL 2 style, without uniform buffer objects) */ /* shader interfaces (legacy GL 2 style, without uniform buffer objects) */
typedef struct typedef struct {
{
int ssao_uniform; int ssao_uniform;
int ssao_color_uniform; int ssao_color_uniform;
int color_uniform; int color_uniform;
@ -73,8 +72,7 @@ typedef struct
int ssao_jitter_uniform; int ssao_jitter_uniform;
} GPUSSAOShaderInterface; } GPUSSAOShaderInterface;
typedef struct typedef struct {
{
int invrendertargetdim_uniform; int invrendertargetdim_uniform;
int color_uniform; int color_uniform;
int dof_uniform; int dof_uniform;
@ -82,8 +80,7 @@ typedef struct
int viewvecs_uniform; int viewvecs_uniform;
} GPUDOFHQPassOneInterface; } GPUDOFHQPassOneInterface;
typedef struct typedef struct {
{
int rendertargetdim_uniform; int rendertargetdim_uniform;
int color_uniform; int color_uniform;
int coc_uniform; int coc_uniform;
@ -91,8 +88,7 @@ typedef struct
int dof_uniform; int dof_uniform;
} GPUDOFHQPassTwoInterface; } GPUDOFHQPassTwoInterface;
typedef struct typedef struct {
{
int dof_uniform; int dof_uniform;
int invrendertargetdim_uniform; int invrendertargetdim_uniform;
int color_uniform; int color_uniform;
@ -102,8 +98,7 @@ typedef struct
int depth_uniform; int depth_uniform;
} GPUDOFHQPassThreeInterface; } GPUDOFHQPassThreeInterface;
typedef struct typedef struct {
{
int dof_uniform; int dof_uniform;
int invrendertargetdim_uniform; int invrendertargetdim_uniform;
int color_uniform; int color_uniform;
@ -111,8 +106,7 @@ typedef struct
int viewvecs_uniform; int viewvecs_uniform;
} GPUDOFPassOneInterface; } GPUDOFPassOneInterface;
typedef struct typedef struct {
{
int dof_uniform; int dof_uniform;
int invrendertargetdim_uniform; int invrendertargetdim_uniform;
int color_uniform; int color_uniform;
@ -120,20 +114,17 @@ typedef struct
int viewvecs_uniform; int viewvecs_uniform;
} GPUDOFPassTwoInterface; } GPUDOFPassTwoInterface;
typedef struct typedef struct {
{
int near_coc_downsampled; int near_coc_downsampled;
int near_coc_blurred; int near_coc_blurred;
} GPUDOFPassThreeInterface; } GPUDOFPassThreeInterface;
typedef struct typedef struct {
{
int near_coc_downsampled; int near_coc_downsampled;
int invrendertargetdim_uniform; int invrendertargetdim_uniform;
} GPUDOFPassFourInterface; } GPUDOFPassFourInterface;
typedef struct typedef struct {
{
int medium_blurred_uniform; int medium_blurred_uniform;
int high_blurred_uniform; int high_blurred_uniform;
int dof_uniform; int dof_uniform;
@ -143,8 +134,7 @@ typedef struct
int viewvecs_uniform; int viewvecs_uniform;
} GPUDOFPassFiveInterface; } GPUDOFPassFiveInterface;
typedef struct typedef struct {
{
int depth_uniform; int depth_uniform;
} GPUDepthResolveInterface; } GPUDepthResolveInterface;
@ -1332,8 +1322,7 @@ void GPU_fx_shader_init_interface(struct GPUShader *shader, GPUFXShaderEffect ef
if (!shader) if (!shader)
return; return;
switch (effect) switch (effect) {
{
case GPU_SHADER_FX_SSAO: case GPU_SHADER_FX_SSAO:
{ {
GPUSSAOShaderInterface *interface = MEM_mallocN(sizeof(GPUSSAOShaderInterface), "GPUSSAOShaderInterface"); GPUSSAOShaderInterface *interface = MEM_mallocN(sizeof(GPUSSAOShaderInterface), "GPUSSAOShaderInterface");

2
source/blender/gpu/intern/gpu_material.c
View File

@ -1312,7 +1312,7 @@ static void do_material_tex(GPUShadeInput *shi)
texture_rgb_blend(mat, tcol, shi->specrgb, tin, colspecfac, mtex->blendtype, &shi->specrgb); texture_rgb_blend(mat, tcol, shi->specrgb, tin, colspecfac, mtex->blendtype, &shi->specrgb);
} }
if(mtex->mapto & MAP_COLMIR) { if (mtex->mapto & MAP_COLMIR) {
GPUNodeLink *colmirfac; GPUNodeLink *colmirfac;
if (mtex->mirrfac == 1.0f) colmirfac = stencil; if (mtex->mirrfac == 1.0f) colmirfac = stencil;