diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-11-12 13:11:46 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-11-12 13:11:46 +0300 |
| commit | a5d69d81e8056f3f0aa261dc133237bf307b3c64 (patch) | |
| tree | 103de614337280cdae066301f73ba2f510745027 /source/blender/makesrna/intern/rna_internal.h | |
| parent | b81ce32a59185003ec4434e6e2da0eb64f004b0f (diff) | |
| parent | f30a2a786214c4ef08612486c227add0bb6bf35b (diff) | |
Merge branch 'blender2.8' into hair_guides
Diffstat (limited to 'source/blender/makesrna/intern/rna_internal.h')
| -rw-r--r-- | source/blender/makesrna/intern/rna_internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_internal.h b/source/blender/makesrna/intern/rna_internal.h index 40861487f41..7ce5f15eb13 100644 --- a/source/blender/makesrna/intern/rna_internal.h +++ b/source/blender/makesrna/intern/rna_internal.h @@ -414,7 +414,7 @@ PointerRNA rna_pointer_inherit_refine(struct PointerRNA *ptr, struct StructRNA * int rna_parameter_size(struct PropertyRNA *parm); struct Mesh *rna_Main_meshes_new_from_object( - struct Main *bmain, struct ReportList *reports, struct Scene *sce, struct SceneLayer *sl, + struct Main *bmain, struct ReportList *reports, struct Scene *sce, struct SceneLayer *scene_layer, struct Object *ob, int apply_modifiers, int settings, int calc_tessface, int calc_undeformed); /* XXX, these should not need to be defined here~! */ |