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/curve | |
| parent | 2f9df08aa8eaad1127f1b44aed518e1beaf91df7 (diff) | |
Cleanup: Rename ViewLayer *sl > ViewLayer *view_layer
Diffstat (limited to 'source/blender/editors/curve')
| -rw-r--r-- | source/blender/editors/curve/editcurve.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/curve/editfont.c | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 2faceaa454d..e8c784f15d5 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -1288,7 +1288,7 @@ static int separate_exec(bContext *C, wmOperator *op) { 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 *oldob, *newob; Base *oldbase, *newbase; Curve *oldcu, *newcu; @@ -1316,7 +1316,7 @@ static int separate_exec(bContext *C, wmOperator *op) } /* 2. duplicate the object and data */ - newbase = ED_object_add_duplicate(bmain, scene, sl, oldbase, 0); /* 0 = fully linked */ + newbase = ED_object_add_duplicate(bmain, scene, view_layer, oldbase, 0); /* 0 = fully linked */ DEG_relations_tag_update(bmain); newob = newbase->object; diff --git a/source/blender/editors/curve/editfont.c b/source/blender/editors/curve/editfont.c index 915684e6ca5..cbb5abf1309 100644 --- a/source/blender/editors/curve/editfont.c +++ b/source/blender/editors/curve/editfont.c @@ -423,7 +423,7 @@ static void txt_add_object(bContext *C, TextLine *firstline, int totline, const { 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); EvaluationContext eval_ctx; Curve *cu; Object *obedit; @@ -436,8 +436,8 @@ static void txt_add_object(bContext *C, TextLine *firstline, int totline, const CTX_data_eval_ctx(C, &eval_ctx); - obedit = BKE_object_add(bmain, scene, sl, OB_FONT, NULL); - base = sl->basact; + obedit = BKE_object_add(bmain, scene, view_layer, OB_FONT, NULL); + base = view_layer->basact; /* seems to assume view align ? TODO - look into this, could be an operator option */ ED_object_base_init_transform(C, base, NULL, rot); |