Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-03-11 23:09:01 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-03-11 23:09:01 +0400
commitc21c58f44c16b3d503d81577c1943f1f4b47b675 (patch)
tree1cb0bc60de38cd96f67f196e9c71f096b9c2c691 /source/blender/render
parent65895a2a383738d6edf0d82b428483065d672305 (diff)
style cleanup, also remove unused externs.
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/include/sunsky.h2
-rw-r--r--source/blender/render/intern/raytrace/reorganize.h5
-rw-r--r--source/blender/render/intern/raytrace/vbvh.h4
-rw-r--r--source/blender/render/intern/source/rayshade.c2
-rw-r--r--source/blender/render/intern/source/sss.c2
5 files changed, 7 insertions, 8 deletions
diff --git a/source/blender/render/intern/include/sunsky.h b/source/blender/render/intern/include/sunsky.h
index 62b68484629..6a41517b113 100644
--- a/source/blender/render/intern/include/sunsky.h
+++ b/source/blender/render/intern/include/sunsky.h
@@ -79,7 +79,7 @@ void InitSunSky(struct SunSky *sunsky, float turb, float *toSun, float horizon_b
void GetSkyXYZRadiance(struct SunSky *sunsky, float theta, float phi, float color_out[3]);
void GetSkyXYZRadiancef(struct SunSky *sunsky, const float varg[3], float color_out[3]);
void InitAtmosphere(struct SunSky *sunSky, float sun_intens, float mief, float rayf, float inscattf, float extincf, float disf);
-void AtmospherePixleShader( struct SunSky *sunSky, float view[3], float s, float rgb[3]);
+void AtmospherePixleShader(struct SunSky *sunSky, float view[3], float s, float rgb[3]);
void ClipColor(float c[3]);
#endif /*__SUNSKY_H__*/
diff --git a/source/blender/render/intern/raytrace/reorganize.h b/source/blender/render/intern/raytrace/reorganize.h
index 6efe37b81a3..11d12dac23c 100644
--- a/source/blender/render/intern/raytrace/reorganize.h
+++ b/source/blender/render/intern/raytrace/reorganize.h
@@ -271,8 +271,9 @@ void pushdown(Node *parent)
s_child = next_s_child;
}
- for(Node *i = parent->child; RE_rayobject_isAligned(i) && i; i = i->sibling)
- pushdown( i );
+ for (Node *i = parent->child; RE_rayobject_isAligned(i) && i; i = i->sibling) {
+ pushdown(i);
+ }
}
diff --git a/source/blender/render/intern/raytrace/vbvh.h b/source/blender/render/intern/raytrace/vbvh.h
index 7d4d25c8d00..e1b4ec420ef 100644
--- a/source/blender/render/intern/raytrace/vbvh.h
+++ b/source/blender/render/intern/raytrace/vbvh.h
@@ -167,8 +167,8 @@ struct BuildBinaryVBVH
{
Node *node = create_node();
INIT_MINMAX(node->bb, node->bb+3);
- rtbuild_merge_bb(builder, node->bb, node->bb+3);
- node->child = (Node*) rtbuild_get_primitive( builder, 0 );
+ rtbuild_merge_bb(builder, node->bb, node->bb+3);
+ node->child = (Node *) rtbuild_get_primitive(builder, 0);
return node;
}
else
diff --git a/source/blender/render/intern/source/rayshade.c b/source/blender/render/intern/source/rayshade.c
index 9272dcf5b30..c072a664fff 100644
--- a/source/blender/render/intern/source/rayshade.c
+++ b/source/blender/render/intern/source/rayshade.c
@@ -134,7 +134,7 @@ static RayObject* RE_rayobject_create(Render *re, int type, int size)
if(res)
- RE_rayobject_config_control( res, re );
+ RE_rayobject_config_control(res, re);
return res;
}
diff --git a/source/blender/render/intern/source/sss.c b/source/blender/render/intern/source/sss.c
index a60db8a963f..6e37c81b882 100644
--- a/source/blender/render/intern/source/sss.c
+++ b/source/blender/render/intern/source/sss.c
@@ -77,8 +77,6 @@
#include "sss.h"
#include "zbuf.h"
-extern Render R; // meh
-
/* Generic Multiple Scattering API */
/* Relevant papers: