archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2019-03-25 11:42:28 +11:00
parent e86e0aad55
commit abd18f6ec0
18 changed files with 43 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/render/intern/source/external_engine.c
View File

@@ -432,7 +432,7 @@ bool RE_engine_get_spherical_stereo(RenderEngine *engine, Object *camera)
return BKE_camera_multiview_spherical_stereo(re ? &re->r : NULL, camera) ? 1 : 0;
}
rcti* RE_engine_get_current_tiles(Render *re, int *r_total_tiles, bool *r_needs_free)
rcti *RE_engine_get_current_tiles(Render *re, int *r_total_tiles, bool *r_needs_free)
{
static rcti tiles_static[BLENDER_MAX_THREADS];
const int allocation_step = BLENDER_MAX_THREADS;

2
source/blender/render/intern/source/imagetexture.c
View File

@@ -689,7 +689,7 @@ static int ibuf_get_color_clip(float col[4], ImBuf *ibuf, int x, int y, int extf
}
if (ibuf->rect_float) {
const float* fp = ibuf->rect_float + (x + y*ibuf->x)*ibuf->channels;
const float *fp = ibuf->rect_float + (x + y * ibuf->x) * ibuf->channels;
if (ibuf->channels == 1)
col[0] = col[1] = col[2] = col[3] = *fp;
else {

2
source/blender/render/intern/source/pipeline.c
View File

@@ -354,7 +354,7 @@ Scene *RE_GetScene(Render *re)
return NULL;
}
void RE_SetScene(Render *re, Scene* sce)
void RE_SetScene(Render *re, Scene *sce)
{
if (re) {
re->scene = sce;

2
source/blender/render/intern/source/render_result.c
View File

@@ -169,7 +169,7 @@ void render_result_views_shallowdelete(RenderResult *rr)
}
static char* set_pass_name(char *outname, const char *name, int channel, const char *chan_id)
static char *set_pass_name(char *outname, const char *name, int channel, const char *chan_id)
{
BLI_strncpy(outname, name, EXR_PASS_MAXNAME);
if (channel >= 0) {