[Bf-blender-cvs] [178ea1f7982] blender2.8: Cleanup, naming of engine type variable
Sergey Sharybin
noreply at git.blender.org
Tue Nov 28 15:09:15 CET 2017
Commit: 178ea1f7982922f319e55de9288352d3a3e4af43
Author: Sergey Sharybin
Date: Tue Nov 28 15:06:32 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB178ea1f7982922f319e55de9288352d3a3e4af43
Cleanup, naming of engine type variable
===================================================================
M source/blender/blenkernel/intern/context.c
M source/blender/blenkernel/intern/sequencer.c
M source/blender/depsgraph/DEG_depsgraph.h
M source/blender/depsgraph/intern/depsgraph_eval.cc
M source/blender/draw/DRW_engine.h
M source/blender/draw/engines/external/external_engine.c
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager.c
M source/blender/editors/curve/editcurve.c
M source/blender/editors/include/ED_transform_snap_object_context.h
M source/blender/editors/include/ED_view3d.h
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/editors/space_view3d/view3d_select.c
M source/blender/editors/space_view3d/view3d_walk.c
M source/blender/editors/transform/transform.h
M source/blender/editors/transform/transform_conversions.c
M source/blender/editors/transform/transform_generics.c
M source/blender/editors/transform/transform_snap.c
M source/blender/editors/transform/transform_snap_object.c
M source/blender/makesrna/intern/rna_context.c
M source/blender/makesrna/intern/rna_scene_api.c
===================================================================
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index b9fef2993b6..5b0df663cc9 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -1269,8 +1269,8 @@ 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 = CTX_data_engine(C);
+ RenderEngineType *engine_type = CTX_data_engine(C);
DEG_evaluation_context_init_from_scene(eval_ctx,
- scene, view_layer, engine,
+ scene, view_layer, engine_type,
DAG_EVAL_VIEWPORT);
}
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index ced94af26d2..f925259e206 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -3321,7 +3321,7 @@ static ImBuf *seq_render_scene_strip(const SeqRenderData *context, Sequence *seq
context->scene->r.seq_prev_type = 3 /* == OB_SOLID */;
/* opengl offscreen render */
- context->eval_ctx->engine = RE_engines_find(scene->view_render.engine_id);
+ context->eval_ctx->engine_type = RE_engines_find(scene->view_render.engine_id);
BKE_scene_graph_update_for_newframe(context->eval_ctx, depsgraph, context->bmain, scene, view_layer);
ibuf = sequencer_view3d_cb(
/* set for OpenGL render (NULL when scrubbing) */
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h
index 25e5714a7d7..b95fea24053 100644
--- a/source/blender/depsgraph/DEG_depsgraph.h
+++ b/source/blender/depsgraph/DEG_depsgraph.h
@@ -86,7 +86,7 @@ typedef struct EvaluationContext {
struct Depsgraph *depsgraph;
struct ViewLayer *view_layer;
- struct RenderEngineType *engine;
+ struct RenderEngineType *engine_type;
} EvaluationContext;
/* DagNode->eval_flags */
@@ -218,7 +218,7 @@ void DEG_evaluation_context_init(struct EvaluationContext *eval_ctx,
void DEG_evaluation_context_init_from_scene(struct EvaluationContext *eval_ctx,
struct Scene *scene,
struct ViewLayer *view_layer,
- struct RenderEngineType *engine,
+ struct RenderEngineType *engine_type,
eEvaluationMode mode);
/* Free evaluation context. */
diff --git a/source/blender/depsgraph/intern/depsgraph_eval.cc b/source/blender/depsgraph/intern/depsgraph_eval.cc
index 31332b416d5..1d389b902b8 100644
--- a/source/blender/depsgraph/intern/depsgraph_eval.cc
+++ b/source/blender/depsgraph/intern/depsgraph_eval.cc
@@ -81,13 +81,13 @@ void DEG_evaluation_context_init(EvaluationContext *eval_ctx,
void DEG_evaluation_context_init_from_scene(EvaluationContext *eval_ctx,
Scene *scene,
ViewLayer *view_layer,
- RenderEngineType *engine,
+ RenderEngineType *engine_type,
eEvaluationMode mode)
{
DEG_evaluation_context_init(eval_ctx, mode);
eval_ctx->depsgraph = BKE_scene_get_depsgraph(scene, view_layer, false);
eval_ctx->view_layer = view_layer;
- eval_ctx->engine = engine;
+ eval_ctx->engine_type = engine_type;
eval_ctx->ctime = BKE_scene_frame_get(scene);
BLI_assert(eval_ctx->depsgraph != NULL);
}
diff --git a/source/blender/draw/DRW_engine.h b/source/blender/draw/DRW_engine.h
index da7524754de..ec0c7a6682e 100644
--- a/source/blender/draw/DRW_engine.h
+++ b/source/blender/draw/DRW_engine.h
@@ -74,7 +74,7 @@ void DRW_draw_view(const struct bContext *C);
void DRW_draw_render_loop_ex(
struct Depsgraph *graph,
- struct RenderEngineType *engine,
+ struct RenderEngineType *engine_type,
struct ARegion *ar, struct View3D *v3d,
const struct bContext *evil_C);
void DRW_draw_render_loop(
@@ -82,7 +82,7 @@ void DRW_draw_render_loop(
struct ARegion *ar, struct View3D *v3d);
void DRW_draw_render_loop_offscreen(
struct Depsgraph *graph,
- struct RenderEngineType *engine,
+ struct RenderEngineType *engine_type,
struct ARegion *ar, struct View3D *v3d,
struct GPUOffScreen *ofs);
void DRW_draw_select_loop(
diff --git a/source/blender/draw/engines/external/external_engine.c b/source/blender/draw/engines/external/external_engine.c
index 76f5b4d9840..bdf53fd3046 100644
--- a/source/blender/draw/engines/external/external_engine.c
+++ b/source/blender/draw/engines/external/external_engine.c
@@ -151,7 +151,7 @@ static void external_draw_scene(void *vedata)
/* Create render engine. */
if (!rv3d->render_engine) {
- RenderEngineType *engine_type = draw_ctx->engine;
+ RenderEngineType *engine_type = draw_ctx->engine_type;
if (!(engine_type->view_update && engine_type->render_to_view)) {
return;
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 8d89454fa6a..793608c62a9 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -443,7 +443,7 @@ typedef struct DRWContextState {
/* Use 'scene->obedit' for edit-mode */
struct Object *obact; /* 'OBACT' */
- struct RenderEngineType *engine;
+ struct RenderEngineType *engine_type;
/* Last resort (some functions take this as an arg so we can't easily avoid).
* May be NULL when used for selection or depth buffer. */
diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c
index 1e0061bc29c..9bb3f3def90 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -2978,14 +2978,14 @@ static void use_drw_engine(DrawEngineType *engine)
/* TODO revisit this when proper layering is implemented */
/* Gather all draw engines needed and store them in DST.enabled_engines
* That also define the rendering order of engines */
-static void DRW_engines_enable_from_engine(RenderEngineType *engine)
+static void DRW_engines_enable_from_engine(RenderEngineType *engine_type)
{
/* TODO layers */
- if (engine->draw_engine != NULL) {
- use_drw_engine(engine->draw_engine);
+ if (engine_type->draw_engine != NULL) {
+ use_drw_engine(engine_type->draw_engine);
}
- if ((engine->flag & RE_INTERNAL) == 0) {
+ if ((engine_type->flag & RE_INTERNAL) == 0) {
DRW_engines_enable_external();
}
}
@@ -3062,12 +3062,12 @@ static void DRW_engines_enable_external(void)
use_drw_engine(DRW_engine_viewport_external_type.draw_engine);
}
-static void DRW_engines_enable(const Scene *scene, ViewLayer *view_layer, RenderEngineType *engine)
+static void DRW_engines_enable(const Scene *scene, ViewLayer *view_layer, RenderEngineType *engine_type)
{
Object *obact = OBACT(view_layer);
const int mode = CTX_data_mode_enum_ex(scene->obedit, obact);
- DRW_engines_enable_from_engine(engine);
+ DRW_engines_enable_from_engine(engine_type);
if (DRW_state_draw_support()) {
DRW_engines_enable_from_object_mode();
@@ -3226,7 +3226,7 @@ void DRW_notify_view_update(const bContext *C)
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = ar->regiondata;
Scene *scene = DEG_get_evaluated_scene(graph);
- RenderEngineType *engine = CTX_data_engine(C);
+ RenderEngineType *engine_type = CTX_data_engine(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
if (rv3d->viewport == NULL) {
@@ -3239,10 +3239,10 @@ void DRW_notify_view_update(const bContext *C)
DST.viewport = rv3d->viewport;
DST.draw_ctx = (DRWContextState){
- ar, rv3d, v3d, scene, view_layer, OBACT(view_layer), engine, C,
+ ar, rv3d, v3d, scene, view_layer, OBACT(view_layer), engine_type, C,
};
- DRW_engines_enable(scene, view_layer, engine);
+ DRW_engines_enable(scene, view_layer, engine_type);
for (LinkData *link = DST.enabled_engines.first; link; link = link->next) {
DrawEngineType *draw_engine = link->data;
@@ -3271,13 +3271,13 @@ void DRW_notify_view_update(const bContext *C)
void DRW_draw_view(const bContext *C)
{
struct Depsgraph *graph = CTX_data_depsgraph(C);
- RenderEngineType *engine = CTX_data_engine(C);
+ RenderEngineType *engine_type = CTX_data_engine(C);
ARegion *ar = CTX_wm_region(C);
View3D *v3d = CTX_wm_view3d(C);
/* Reset before using it. */
memset(&DST, 0x0, sizeof(DST));
- DRW_draw_render_loop_ex(graph, engine, ar, v3d, C);
+ DRW_draw_render_loop_ex(graph, engine_type, ar, v3d, C);
}
/**
@@ -3286,7 +3286,7 @@ void DRW_draw_view(const bContext *C)
*/
void DRW_draw_render_loop_ex(
struct Depsgraph *graph,
- RenderEngineType *engine,
+ RenderEngineType *engine_type,
ARegion *ar, View3D *v3d,
const bContext *evil_C)
{
@@ -3303,7 +3303,7 @@ void DRW_draw_render_loop_ex(
GPU_viewport_engines_data_validate(DST.viewport, DRW_engines_get_hash());
DST.draw_ctx = (DRWContextState){
- ar, rv3d, v3d, scene, view_layer, OBACT(view_layer), engine,
+ ar, rv3d, v3d, scene, view_layer, OBACT(view_layer), engine_type,
/* reuse if caller sets */
DST.draw_ctx.evil_C,
@@ -3312,7 +3312,7 @@ void DRW_draw_render_loop_ex(
DRW_viewport_var_init();
/* Get list of enabled engines */
- DRW_engines_enable(scene, view_layer, engine);
+ DRW_engines_enable(scene, view_layer, engine_type);
/* Update ubos */
DRW_globals_update();
@@ -3419,13 +3419,13 @@ void DRW_draw_render_loop(
memset(&DST, 0x0, sizeof(DST));
Scene *scene = DEG_get_evaluated_scene(graph);
- RenderEngineType *engine = RE_engines_find(scene->view_render.engine_id);
+ RenderEngineType *engine_type = RE_engines_find(scene->view_render.engine_id);
- DRW_draw_render_loop_ex(graph, engine, ar, v3d, NULL);
+ DRW_draw_render_loop_ex(graph, engine_type, ar, v3d, NULL);
}
void DRW_draw_render_loop_offscreen(
- struct Depsgraph *graph, RenderEngineType *engine,
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list