[Bf-blender-cvs] [f04a5ad1e44] soc-2019-openxr: Merge branch 'master' into soc-2019-openxr
Julian Eisel
noreply at git.blender.org
Thu Aug 1 21:55:36 CEST 2019
Commit: f04a5ad1e44c389f260d6c36ead72abac9b22384
Author: Julian Eisel
Date: Thu Aug 1 21:27:08 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBf04a5ad1e44c389f260d6c36ead72abac9b22384
Merge branch 'master' into soc-2019-openxr
===================================================================
===================================================================
diff --cc source/blender/editors/include/ED_view3d.h
index 72efea32c38,081bcbf4746..9bf85b8268a
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -564,27 -568,9 +568,27 @@@ void ED_view3d_draw_offscreen(struct De
bool do_sky,
bool is_persp,
const char *viewname,
- const bool do_color_managment,
+ const bool do_color_management,
struct GPUOffScreen *ofs,
struct GPUViewport *viewport);
+void ED_view3d_draw_offscreen_simple(struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct View3DShading *shading_override,
+ int drawtype,
+ int winx,
+ int winy,
+ unsigned int draw_flags,
+ float viewmat[4][4],
+ float winmat[4][4],
+ float clip_start,
+ float clip_end,
+ float lens,
+ bool do_sky,
+ bool is_persp,
+ const char *viewname,
+ const bool do_color_management,
+ struct GPUOffScreen *ofs,
+ struct GPUViewport *viewport);
void ED_view3d_draw_setup_view(struct wmWindow *win,
struct Depsgraph *depsgraph,
struct Scene *scene,
More information about the Bf-blender-cvs
mailing list