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-09 17:32:01 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-09 17:45:21 +0300
commit2466afd089ee370c7b6ccb288fc38fdcc6152805 (patch)
tree0aec2de6c9023f38ea055a16f63ac18b223e4bba /source/blender/makesrna/intern/rna_main_api.c
parent859417c65796a48599eb073bcfe03f2382110f38 (diff)
Cleanup: Use full name for scene_layer in makesrna
Diffstat (limited to 'source/blender/makesrna/intern/rna_main_api.c')
-rw-r--r--source/blender/makesrna/intern/rna_main_api.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index 52b953549ba..3f0b213efac 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -301,14 +301,14 @@ static Mesh *rna_Main_meshes_new(Main *bmain, const char *name)
/* copied from Mesh_getFromObject and adapted to RNA interface */
/* settings: 1 - preview, 2 - render */
Mesh *rna_Main_meshes_new_from_object(
- Main *bmain, ReportList *reports, Scene *sce, SceneLayer *sl,
+ Main *bmain, ReportList *reports, Scene *sce, SceneLayer *scene_layer,
Object *ob, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed)
{
EvaluationContext eval_ctx;
DEG_evaluation_context_init(&eval_ctx, settings);
eval_ctx.ctime = (float)sce->r.cfra + sce->r.subframe;
- eval_ctx.scene_layer = sl;
+ eval_ctx.scene_layer = scene_layer;
switch (ob->type) {
case OB_FONT: