Commit: 40a345a9c75259216c158ec509e756c4d3f19fd5
Author: Campbell Barton
Date: Wed Jun 24 05:13:43 2015 +1000
Branches: master
https://developer.blender.org/rB40a345a9c75259216c158ec509e756c4d3f19fd5
Cleanup: style
===================================================================
M source/blender/blenloader/intern/writefile.c
M source/blender/gpu/intern/gpu_codegen.c
M source/blender/gpu/intern/gpu_extensions.c
M source/blender/imbuf/intern/openexr/openexr_api.cpp
M source/blender/makesrna/intern/rna_smoke.c
===================================================================
diff --git a/source/blender/blenloader/intern/writefile.c
b/source/blender/blenloader/intern/writefile.c
index fc46471..f5954ab 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1096,7 +1096,7 @@ static void write_pointcaches(WriteData *wd, ListBase
*ptcaches)
for (i=0; i<BPHYS_TOT_DATA; i++) {
if (pm->data[i] && pm->data_types &
(1<<i)) {
- if
(ptcache_data_struct[i][0]=='\0')
+ if (ptcache_data_struct[i][0]
== '\0')
writedata(wd, DATA,
MEM_allocN_len(pm->data[i]), pm->data[i]);
else
writestruct(wd, DATA,
ptcache_data_struct[i], pm->totpoint, pm->data[i]);
@@ -1104,7 +1104,7 @@ static void write_pointcaches(WriteData *wd, ListBase
*ptcaches)
}
for (; extra; extra=extra->next) {
- if
(ptcache_extra_struct[extra->type][0]=='\0')
+ if
(ptcache_extra_struct[extra->type][0] == '\0')
continue;
writestruct(wd, DATA, "PTCacheExtra",
1, extra);
writestruct(wd, DATA,
ptcache_extra_struct[extra->type], extra->totdata, extra->data);
diff --git a/source/blender/gpu/intern/gpu_codegen.c
b/source/blender/gpu/intern/gpu_codegen.c
index 68e268c..9440118 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -184,8 +184,8 @@ static void gpu_parse_functions_string(GHash *hash, char
*code)
/* add parameter */
code = gpu_str_skip_token(code, NULL, 0);
code = gpu_str_skip_token(code, NULL, 0);
- function->paramqual[function->totparam]= qual;
- function->paramtype[function->totparam]= type;
+ function->paramqual[function->totparam] = qual;
+ function->paramtype[function->totparam] = type;
function->totparam++;
}
else {
diff --git a/source/blender/gpu/intern/gpu_extensions.c
b/source/blender/gpu/intern/gpu_extensions.c
index bab489a..b757aff 100644
--- a/source/blender/gpu/intern/gpu_extensions.c
+++ b/source/blender/gpu/intern/gpu_extensions.c
@@ -773,7 +773,7 @@ GPUTexture *GPU_texture_from_preview(PreviewImage *prv, int
mipmap)
tex->refcount = 1;
tex->target = GL_TEXTURE_2D;
- prv->gputexture[0]= tex;
+ prv->gputexture[0] = tex;
if (!glIsTexture(tex->bindcode)) {
GPU_ASSERT_NO_GL_ERRORS("Blender Texture Not Loaded");
diff --git a/source/blender/imbuf/intern/openexr/openexr_api.cpp
b/source/blender/imbuf/intern/openexr/openexr_api.cpp
index 7228814..ba19794 100644
--- a/source/blender/imbuf/intern/openexr/openexr_api.cpp
+++ b/source/blender/imbuf/intern/openexr/openexr_api.cpp
@@ -1082,7 +1082,7 @@ void IMB_exr_write_channels(void *handle)
/* We allocate teporary storage for half pixels for all the
channels at once. */
if (data->num_half_channels != 0) {
- rect_half = (half*)MEM_mallocN(sizeof(half) *
data->num_half_channels * num_pixels, __func__);
+ rect_half = (half *)MEM_mallocN(sizeof(half) *
data->num_half_channels * num_pixels, __func__);
current_rect_half = rect_half;
}
diff --git a/source/blender/makesrna/intern/rna_smoke.c
b/source/blender/makesrna/intern/rna_smoke.c
index 6dcba3b..539f3c1 100644
--- a/source/blender/makesrna/intern/rna_smoke.c
+++ b/source/blender/makesrna/intern/rna_smoke.c
@@ -228,7 +228,7 @@ static void rna_SmokeModifier_velocity_grid_get(PointerRNA
*ptr, float *values)
vy = smoke_get_velocity_y(sds->fluid);
vz = smoke_get_velocity_z(sds->fluid);
- for (i=0; i<size; i+=3) {
+ for (i = 0; i < size; i += 3) {
*(values++) = *(vx++);
*(values++) = *(vy++);
*(values++) = *(vz++);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
