diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 18:51:49 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-11-23 19:58:01 +0300 |
| commit | b79b8478ee3bb1b115c5d6b8bdb0cc74d5169955 (patch) | |
| tree | d67b529dc95488186255631660d3251cfb5da5da /source/blender/editors/util | |
| parent | 2f9df08aa8eaad1127f1b44aed518e1beaf91df7 (diff) | |
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
Diffstat (limited to 'source/blender/editors/util')
| -rw-r--r-- | source/blender/editors/util/ed_util.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/util/undo.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/util/ed_util.c b/source/blender/editors/util/ed_util.c index e74c909e36e..b52cc20f71f 100644 --- a/source/blender/editors/util/ed_util.c +++ b/source/blender/editors/util/ed_util.c @@ -88,8 +88,8 @@ void ED_editors_init(bContext *C) wmWindowManager *wm = CTX_wm_manager(C); Main *bmain = CTX_data_main(C); Scene *sce = CTX_data_scene(C); - ViewLayer *sl = CTX_data_view_layer(C); - Object *ob, *obact = (sl && sl->basact) ? sl->basact->object : NULL; + ViewLayer *view_layer = CTX_data_view_layer(C); + Object *ob, *obact = (view_layer && view_layer->basact) ? view_layer->basact->object : NULL; ID *data; /* This is called during initialization, so we don't want to store any reports */ diff --git a/source/blender/editors/util/undo.c b/source/blender/editors/util/undo.c index aa636699679..1ee1430d9f0 100644 --- a/source/blender/editors/util/undo.c +++ b/source/blender/editors/util/undo.c @@ -120,7 +120,7 @@ static int ed_undo_step(bContext *C, int step, const char *undoname) wmWindow *win = CTX_wm_window(C); Main *bmain = CTX_data_main(C); Scene *scene = CTX_data_scene(C); - ViewLayer *sl = CTX_data_view_layer(C); + ViewLayer *view_layer = CTX_data_view_layer(C); Object *obedit = CTX_data_edit_object(C); Object *obact = CTX_data_active_object(C); ScrArea *sa = CTX_wm_area(C); @@ -181,9 +181,9 @@ static int ed_undo_step(bContext *C, int step, const char *undoname) } else if (obact && obact->mode & OB_MODE_PARTICLE_EDIT) { if (step == 1) - PE_undo(scene, sl); + PE_undo(scene, view_layer); else - PE_redo(scene, sl); + PE_redo(scene, view_layer); } else if (U.uiflag & USER_GLOBALUNDO) { // note python defines not valid here anymore. |