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

Dalai Felinto noreply at git.blender.org
Thu Aug 21 22:38:21 CEST 2014


Commit: 273345ed84f657fba2aadb4b3def6335799c46d7
Author: Dalai Felinto
Date:   Thu Aug 21 13:18:00 2014 +0200
Branches: multiview
https://developer.blender.org/rB273345ed84f657fba2aadb4b3def6335799c46d7

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

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



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

diff --cc source/blender/render/extern/include/RE_pipeline.h
index b5f9ad3,3b54de4..d2ee220
--- a/source/blender/render/extern/include/RE_pipeline.h
+++ b/source/blender/render/extern/include/RE_pipeline.h
@@@ -225,10 -194,9 +225,11 @@@ void RE_InitState(struct Render *re, st
                    struct SceneRenderLayer *srl,
                    int winx, int winy, rcti *disprect);
  void RE_ChangeResolution(struct Render *re, int winx, int winy, rcti *disprect);
+ void RE_ChangeModeFlag(struct Render *re, int flag, bool clear);
  
  /* set up the viewplane/perspective matrix, three choices */
 +struct Object *RE_GetCameraStereo(struct Render *re, const bool left);
 +struct Object *RE_GetViewCamera(struct Render *re);
  struct Object *RE_GetCamera(struct Render *re); /* return camera override if set */
  void RE_SetCamera(struct Render *re, struct Object *camera);
  void RE_SetEnvmapCamera(struct Render *re, struct Object *cam_ob, float viewscale, float clipsta, float clipend);




More information about the Bf-blender-cvs mailing list