Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2015-04-21 15:53:32 +10:00
parent f36e91ad0a
commit b82d571c85
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/shaders/node_image_texture.osl
View File

@@ -26,7 +26,7 @@ point map_to_tube(vector dir)
{ {
float u, v; float u, v;
v = (dir[2] + 1.0) * 0.5; v = (dir[2] + 1.0) * 0.5;
float len = sqrt(dir[0]*dir[0] + dir[1]*dir[1]); float len = sqrt(dir[0] * dir[0] + dir[1] * dir[1]);
if (len > 0.0) { if (len > 0.0) {
u = (1.0 - (atan2(dir[0] / len, dir[1] / len) / M_PI)) * 0.5; u = (1.0 - (atan2(dir[0] / len, dir[1] / len) / M_PI)) * 0.5;
} }
@@ -40,8 +40,8 @@ point map_to_sphere(vector dir)
{ {
float len = length(dir); float len = length(dir);
float v, u; float v, u;
if(len > 0.0) { if (len > 0.0) {
if(dir[0] == 0.0 && dir[1] == 0.0) { if (dir[0] == 0.0 && dir[1] == 0.0) {
u = 0.0; /* Othwise domain error. */ u = 0.0; /* Othwise domain error. */
} }
else { else {

2
source/blender/editors/space_image/image_buttons.c
View File

@@ -580,7 +580,7 @@ static void image_multi_decpass_cb(bContext *C, void *rr_v, void *iuser_v)
ImageUser *iuser = iuser_v; ImageUser *iuser = iuser_v;
RenderLayer *rl; RenderLayer *rl;
RenderPass *rp; RenderPass *rp;
RenderPass *prev= NULL; RenderPass *prev = NULL;
int layer = iuser->layer; int layer = iuser->layer;
if (RE_HasFakeLayer(rr)) if (RE_HasFakeLayer(rr))

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

@@ -117,7 +117,7 @@ void GPU_render_text(MTFace *tface, int mode,
/* color has been set */ /* color has been set */
if (tface->mode & TF_OBCOL) if (tface->mode & TF_OBCOL)
col= NULL; col = NULL;
else if (!col) else if (!col)
glColor3f(1.0f, 1.0f, 1.0f); glColor3f(1.0f, 1.0f, 1.0f);

2
source/blender/nodes/composite/node_composite_util.c
View File

@@ -43,7 +43,7 @@ void cmp_node_update_default(bNodeTree *UNUSED(ntree), bNode *node)
for (sock = node->outputs.first; sock; sock = sock->next) { for (sock = node->outputs.first; sock; sock = sock->next) {
if (sock->cache) { if (sock->cache) {
//free_compbuf(sock->cache); //free_compbuf(sock->cache);
//sock->cache= NULL; //sock->cache = NULL;
} }
} }
node->need_exec = 1; node->need_exec = 1;