diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-06-13 15:09:13 +0400 |
commit | eed13b43b19c619ccdcda67b17c0da65ad44879c (patch) | |
tree | aa759322ad2b18becaf237671dd71ffbda9c2076 /source/blender/blenkernel/BKE_displist.h | |
parent | e10e1ac04e63ed04a5712e515ed28eb92a78fd62 (diff) | |
parent | 2f1e118c30946bd3117c59cd45f13d79e4b612ec (diff) |
merged from trunk 20741:20848
* Missing changes to release/windows/installer
* Sequencer fixes in source/blender/src/seqaudio.c dont apply to 2.5
* brechts fix for #18855 r20763 wasnt merged, does this apply to 2.5?
Diffstat (limited to 'source/blender/blenkernel/BKE_displist.h')
-rw-r--r-- | source/blender/blenkernel/BKE_displist.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_displist.h b/source/blender/blenkernel/BKE_displist.h index c3555c9dd8a..da625b946ce 100644 --- a/source/blender/blenkernel/BKE_displist.h +++ b/source/blender/blenkernel/BKE_displist.h @@ -87,7 +87,7 @@ extern void count_displist(struct ListBase *lb, int *totvert, int *totface); extern void freedisplist(struct ListBase *lb); extern int displist_has_faces(struct ListBase *lb); -extern void makeDispListSurf(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, int forRender); +extern void makeDispListSurf(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, int forRender, int forOrco); extern void makeDispListCurveTypes(struct Scene *scene, struct Object *ob, int forOrco); extern void makeDispListMBall(struct Scene *scene, struct Object *ob); extern void shadeDispList(struct Scene *scene, struct Base *base); |