griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged changes in the trunk up to revision 55700.

Browse Source 
Conflicts resolved:
source/blender/editors/mesh/mesh_intern.h
This commit is contained in:
Tamito Kajiyama
2013-04-01 13:47:19 +00:00
parent 1360bb6fb0 689f3aa174
commit 5524ed9ba2
236 changed files with 5198 additions and 3560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -119,7 +119,7 @@ int imagewrap(Tex *tex, Image *ima, ImBuf *ibuf, const float texvec[3], TexResul
texres->tin= texres->ta= texres->tr= texres->tg= texres->tb= 0.0f;
/* we need to set retval OK, otherwise texture code generates normals itself... */
retval= texres->nor?3:1;
retval= texres->nor ? 3 : 1;
/* quick tests */
if (ibuf==NULL && ima==NULL)
@@ -1500,7 +1500,7 @@ int imagewraposa(Tex *tex, Image *ima, ImBuf *ibuf, const float texvec[3], const
texres->tin= texres->ta= texres->tr= texres->tg= texres->tb= 0.0f;
/* we need to set retval OK, otherwise texture code generates normals itself... */
retval= texres->nor?3:1;
retval = texres->nor ? 3 : 1;
/* quick tests */
if (ibuf==NULL && ima==NULL)

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

@@ -2460,12 +2460,12 @@ static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovie
render_time = re->i.lastframetime;
re->i.lastframetime = PIL_check_seconds_timer() - re->i.starttime;
BLI_timestr(re->i.lastframetime, name);
BLI_timestr(re->i.lastframetime, name, sizeof(name));
printf(" Time: %s", name);
BLI_callback_exec(G.main, NULL, BLI_CB_EVT_RENDER_STATS);
BLI_timestr(re->i.lastframetime - render_time, name);
BLI_timestr(re->i.lastframetime - render_time, name, sizeof(name));
printf(" (Saving: %s)\n", name);
fputc('\n', stdout);