[Bf-blender-cvs] [5c1ac85ba5b] vr_scene_inspection: Merge branch 'soc-2019-openxr' into vr_scene_inspection
Julian Eisel
noreply at git.blender.org
Mon Mar 16 18:22:41 CET 2020
Commit: 5c1ac85ba5b8bd8ea1694a84f7c724da3a887814
Author: Julian Eisel
Date: Mon Mar 16 18:15:33 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB5c1ac85ba5b8bd8ea1694a84f7c724da3a887814
Merge branch 'soc-2019-openxr' into vr_scene_inspection
===================================================================
===================================================================
diff --cc source/blender/editors/include/ED_view3d.h
index ebdd3e94df9,f882d6be9a2..6345fc00ad5
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -584,11 -581,10 +584,11 @@@ void ED_draw_object_facemap(struct Deps
const float col[4],
const int facemap);
- struct RenderEngineType *ED_view3d_engine_type(struct Scene *scene, int drawtype);
+ struct RenderEngineType *ED_view3d_engine_type(const struct Scene *scene, int drawtype);
bool ED_view3d_context_activate(struct bContext *C);
-void ED_view3d_draw_setup_view(struct wmWindow *win,
+void ED_view3d_draw_setup_view(const struct wmWindowManager *wm,
+ struct wmWindow *win,
struct Depsgraph *depsgraph,
struct Scene *scene,
struct ARegion *region,
More information about the Bf-blender-cvs
mailing list