[Bf-blender-cvs] [77598ec] multiview: Merge remote-tracking branch 'origin/master' into multiview

[Dalai Felinto]

Commit: 77598ecd384dab8b83062924d20b12a34d85435e
Author: Dalai Felinto
Date:   Wed Aug 13 12:13:00 2014 +0200
Branches: multiview
https://developer.blender.org/rB77598ecd384dab8b83062924d20b12a34d85435e

Merge remote-tracking branch 'origin/master' into multiview

===================================================================



===================================================================

diff --cc source/blender/render/intern/source/pipeline.c
index 3d25c5e,aaaa53b..19f570e
--- a/source/blender/render/intern/source/pipeline.c
+++ b/source/blender/render/intern/source/pipeline.c
@@@ -3125,9 -2810,19 +3125,19 @@@ void RE_RenderFreestyleStrokes(Render *
  	}
  	re->result_ok = 1;
  }
+ 
+ void RE_RenderFreestyleExternal(Render *re)
+ {
+ 	if (!re->test_break(re->tbh)) {
+ 		RE_Database_FromScene(re, re->main, re->scene, re->lay, 1);
+ 		RE_Database_Preprocess(re);
+ 		add_freestyle(re, 1);
+ 		RE_Database_Free(re);
+ 	}
+ }
  #endif
  
 -static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const char *name_override)
 +static int do_write_image_or_movie(Render *re, Main *bmain, Scene *scene, bMovieHandle *mh, const char *name_override, const char *view)
  {
  	char name[FILE_MAX];
  	RenderResult rres;