[Bf-blender-cvs] [0dd98af2559] blender2.8: Prevent users to be able to override context engine
Dalai Felinto
noreply at git.blender.org
Tue Oct 31 15:14:36 CET 2017
Commit: 0dd98af2559b89149f2b6ae586969c0544c26369
Author: Dalai Felinto
Date: Tue Oct 31 12:09:06 2017 -0200
Branches: blender2.8
https://developer.blender.org/rB0dd98af2559b89149f2b6ae586969c0544c26369
Prevent users to be able to override context engine
We expose engine as a string, yet context is dealing with Pointers. To prevent a crash
we may as well just forbid users to override it.
===================================================================
M source/blender/blenkernel/intern/context.c
===================================================================
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index bc75958ba33..00ad060dd1c 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -949,14 +949,8 @@ ViewRender *CTX_data_view_render(const bContext *C)
RenderEngineType *CTX_data_engine(const bContext *C)
{
- const char *engine_id;
-
- if (!ctx_data_pointer_verify(C, "engine", (void *)&engine_id)) {
- ViewRender *view_render = CTX_data_view_render(C);
- engine_id = view_render->engine_id;
- }
-
- return RE_engines_find(engine_id);
+ ViewRender *view_render = CTX_data_view_render(C);
+ return RE_engines_find(view_render->engine_id);
}
/**
More information about the Bf-blender-cvs
mailing list