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>2013-02-02 04:34:34 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-02-02 04:34:34 +0400
commit6fca85780b966bf610d8e73dc65c538747cbd485 (patch)
tree33f6a98459258bde5e9daef8c822ddbe3d4534b2 /source/blender/render
parent736d7810a0ba6dc4fa1439b8c45d4b6782a9aa31 (diff)
style cleanup: also correct doc example for 'foreach_get/set'
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/source/convertblender.c2
-rw-r--r--source/blender/render/intern/source/renderdatabase.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index 0dc6492fad1..b161bb7d193 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3283,7 +3283,7 @@ static void init_render_mesh(Render *re, ObjectRen *obr, int timeoffset)
}
/* origindex currently only used when baking to vertex colors */
- if(re->flag & R_BAKING && re->r.bake_flag & R_BAKE_VCOL)
+ if (re->flag & R_BAKING && re->r.bake_flag & R_BAKE_VCOL)
need_origindex= 1;
/* check autosmooth and displacement, we then have to skip only-verts optimize */
diff --git a/source/blender/render/intern/source/renderdatabase.c b/source/blender/render/intern/source/renderdatabase.c
index b25f2f4201a..0a8af1c368b 100644
--- a/source/blender/render/intern/source/renderdatabase.c
+++ b/source/blender/render/intern/source/renderdatabase.c
@@ -361,8 +361,8 @@ int *RE_vlakren_get_origindex(ObjectRen *obr, VlakRen *vlak, int verify)
int nr= vlak->index>>8;
origindex= obr->vlaknodes[nr].origindex;
- if(origindex==NULL) {
- if(verify)
+ if (origindex==NULL) {
+ if (verify)
origindex= obr->vlaknodes[nr].origindex= MEM_callocN(256*RE_VLAK_ORIGINDEX_ELEMS*sizeof(int), "origindex table");
else
return NULL;
@@ -440,7 +440,7 @@ VlakRen *RE_vlakren_copy(ObjectRen *obr, VlakRen *vlr)
}
origindex= RE_vlakren_get_origindex(obr, vlr, 0);
- if(origindex) {
+ if (origindex) {
origindex1= RE_vlakren_get_origindex(obr, vlr1, 1);
/* Just an int, but memcpy for consistency. */
memcpy(origindex1, origindex, sizeof(int)*RE_VLAK_ORIGINDEX_ELEMS);
@@ -791,7 +791,7 @@ void free_renderdata_vlaknodes(VlakTableNode *vlaknodes)
MEM_freeN(vlaknodes[a].mtface);
if (vlaknodes[a].mcol)
MEM_freeN(vlaknodes[a].mcol);
- if(vlaknodes[a].origindex)
+ if (vlaknodes[a].origindex)
MEM_freeN(vlaknodes[a].origindex);
if (vlaknodes[a].surfnor)
MEM_freeN(vlaknodes[a].surfnor);