diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:23:01 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-09 18:35:46 +0300 |
| commit | cec7f1215acffcd31e591fce83d78268aff6e72a (patch) | |
| tree | feb2b640e627b0f74cc57d6639f505e90889a383 /source/blender/draw/intern | |
| parent | c35f1d05eaa13348d4f33cdb44f6fb62f68e1ba3 (diff) | |
Rename Scene macros back to their original _NEW less names
Diffstat (limited to 'source/blender/draw/intern')
| -rw-r--r-- | source/blender/draw/intern/DRW_render.h | 2 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_manager.c | 10 | ||||
| -rw-r--r-- | source/blender/draw/intern/draw_view.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h index fe489315e97..b54d90a5682 100644 --- a/source/blender/draw/intern/DRW_render.h +++ b/source/blender/draw/intern/DRW_render.h @@ -441,7 +441,7 @@ typedef struct DRWContextState { struct SceneLayer *scene_layer; /* 'CTX_data_scene_layer(C)' */ /* Use 'scene->obedit' for edit-mode */ - struct Object *obact; /* 'OBACT_NEW' */ + struct Object *obact; /* 'OBACT' */ struct RenderEngineType *engine; diff --git a/source/blender/draw/intern/draw_manager.c b/source/blender/draw/intern/draw_manager.c index 5fc7b512826..7061aa640a5 100644 --- a/source/blender/draw/intern/draw_manager.c +++ b/source/blender/draw/intern/draw_manager.c @@ -3049,7 +3049,7 @@ static void DRW_engines_enable_external(void) static void DRW_engines_enable(const Scene *scene, SceneLayer *scene_layer, RenderEngineType *engine) { - Object *obact = OBACT_NEW(scene_layer); + Object *obact = OBACT(scene_layer); const int mode = CTX_data_mode_enum_ex(scene->obedit, obact); DRW_engines_enable_from_engine(engine); @@ -3224,7 +3224,7 @@ void DRW_notify_view_update(const bContext *C) DST.viewport = rv3d->viewport; DST.draw_ctx = (DRWContextState){ - ar, rv3d, v3d, scene, scene_layer, OBACT_NEW(scene_layer), engine, C, + ar, rv3d, v3d, scene, scene_layer, OBACT(scene_layer), engine, C, }; DRW_engines_enable(scene, scene_layer, engine); @@ -3288,7 +3288,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, scene_layer, OBACT_NEW(scene_layer), engine, + ar, rv3d, v3d, scene, scene_layer, OBACT(scene_layer), engine, /* reuse if caller sets */ DST.draw_ctx.evil_C, @@ -3503,7 +3503,7 @@ void DRW_draw_select_loop( /* Instead of 'DRW_context_state_init(C, &DST.draw_ctx)', assign from args */ DST.draw_ctx = (DRWContextState){ - ar, rv3d, v3d, scene, scene_layer, OBACT_NEW(scene_layer), engine, (bContext *)NULL, + ar, rv3d, v3d, scene, scene_layer, OBACT(scene_layer), engine, (bContext *)NULL, }; DRW_viewport_var_init(); @@ -3600,7 +3600,7 @@ void DRW_draw_depth_loop( /* Instead of 'DRW_context_state_init(C, &DST.draw_ctx)', assign from args */ DST.draw_ctx = (DRWContextState){ - ar, rv3d, v3d, scene, scene_layer, OBACT_NEW(scene_layer), engine, (bContext *)NULL, + ar, rv3d, v3d, scene, scene_layer, OBACT(scene_layer), engine, (bContext *)NULL, }; DRW_viewport_var_init(); diff --git a/source/blender/draw/intern/draw_view.c b/source/blender/draw/intern/draw_view.c index 02a07688f17..8ed51fcd7f6 100644 --- a/source/blender/draw/intern/draw_view.c +++ b/source/blender/draw/intern/draw_view.c @@ -613,7 +613,7 @@ void DRW_draw_background(void) static bool is_cursor_visible(Scene *scene, SceneLayer *scene_layer) { - Object *ob = OBACT_NEW(scene_layer); + Object *ob = OBACT(scene_layer); /* don't draw cursor in paint modes, but with a few exceptions */ if (ob && ob->mode & OB_MODE_ALL_PAINT) { |