Commit: a3c80615d580c5e0b76ae120bf65ea23c9c771a5
Author: Campbell Barton
Date: Mon Apr 16 10:53:16 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBa3c80615d580c5e0b76ae120bf65ea23c9c771a5
Fix stubs
===================================================================
M source/blender/collada/collada_utils.cpp
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/source/blender/collada/collada_utils.cpp
b/source/blender/collada/collada_utils.cpp
index cc18cea662a..569e724b106 100644
--- a/source/blender/collada/collada_utils.cpp
+++ b/source/blender/collada/collada_utils.cpp
@@ -159,7 +159,7 @@ void bc_update_scene(EvaluationContext *eval_ctx, Scene
*scene, float ctime)
{
BKE_scene_frame_set(scene, ctime);
Main *bmain = bc_get_main();
- BKE_scene_graph_update_for_newframe(eval_ctx, eval_ctx->depsgraph,
bmain, scene, eval_ctx->view_layer);
+ BKE_scene_graph_update_for_newframe(eval_ctx->depsgraph, bmain);
}
Object *bc_add_object(Scene *scene, ViewLayer *view_layer, int type, const
char *name)
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c
b/source/blenderplayer/bad_level_call_stubs/stubs.c
index f953f1b89d8..78d895e3779 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -617,9 +617,9 @@ bool ED_texture_context_check_others(const struct bContext
*C) RET_ZERO
bool ED_text_region_location_from_cursor(SpaceText *st, ARegion *ar, const int
cursor_co[2], int r_pixel_co[2]) RET_ZERO
SnapObjectContext *ED_transform_snap_object_context_create(
- struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer,
struct RenderEngineType *engine, int flag) RET_NULL
+ struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer,
int flag) RET_NULL
SnapObjectContext *ED_transform_snap_object_context_create_view3d(
- struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer,
struct RenderEngineType *engine, int flag,
+ struct Main *bmain, struct Scene *scene, struct ViewLayer *view_layer,
int flag,
const struct ARegion *ar, const struct View3D *v3d) RET_NULL
void ED_transform_snap_object_context_destroy(SnapObjectContext *sctx) RET_NONE
bool ED_transform_snap_object_project_ray_ex(
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
