Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-28 17:08:43 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-28 17:08:43 +0300
commit08e7b5d348cf2d2e82a6431aa8641fed7b479166 (patch)
tree003d0d5e3f5bd197e6c7d0e15698aa14d1d9d3b5 /source/blender/blenkernel
parent178ea1f7982922f319e55de9288352d3a3e4af43 (diff)
Cleanup: naming
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_context.h2
-rw-r--r--source/blender/blenkernel/intern/context.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/BKE_context.h b/source/blender/blenkernel/BKE_context.h
index 0bce2a6317c..5628c650d34 100644
--- a/source/blender/blenkernel/BKE_context.h
+++ b/source/blender/blenkernel/BKE_context.h
@@ -254,7 +254,7 @@ struct LayerCollection *CTX_data_layer_collection(const bContext *C);
struct SceneCollection *CTX_data_scene_collection(const bContext *C);
struct ViewLayer *CTX_data_view_layer(const bContext *C);
struct ViewRender *CTX_data_view_render(const bContext *C);
-struct RenderEngineType *CTX_data_engine(const bContext *C);
+struct RenderEngineType *CTX_data_engine_type(const bContext *C);
struct ToolSettings *CTX_data_tool_settings(const bContext *C);
const char *CTX_data_mode_string(const bContext *C);
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index 5b0df663cc9..3a4de77a3b5 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -947,7 +947,7 @@ ViewRender *CTX_data_view_render(const bContext *C)
}
}
-RenderEngineType *CTX_data_engine(const bContext *C)
+RenderEngineType *CTX_data_engine_type(const bContext *C)
{
ViewRender *view_render = CTX_data_view_render(C);
return RE_engines_find(view_render->engine_id);
@@ -1269,7 +1269,7 @@ void CTX_data_eval_ctx(const bContext *C, EvaluationContext *eval_ctx)
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
- RenderEngineType *engine_type = CTX_data_engine(C);
+ RenderEngineType *engine_type = CTX_data_engine_type(C);
DEG_evaluation_context_init_from_scene(eval_ctx,
scene, view_layer, engine_type,
DAG_EVAL_VIEWPORT);