diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-26 15:56:36 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-26 15:56:36 +0300 |
| commit | 322380999ed91179ebce511c7b14e470b48bf993 (patch) | |
| tree | c13a97f18bf388f0f4a2ad3f423764742b3f5bb9 /source/blenderplayer | |
| parent | 650fdcd74fecc14cdfdc0b2e17317f31807b6a40 (diff) | |
| parent | a23fbc71a1886e9f83fd1d6782050d5a8c356d13 (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
source/blender/editors/object/object_ops.c
Diffstat (limited to 'source/blenderplayer')
| -rw-r--r-- | source/blenderplayer/bad_level_call_stubs/stubs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c index 036eca76f76..3310abbc64c 100644 --- a/source/blenderplayer/bad_level_call_stubs/stubs.c +++ b/source/blenderplayer/bad_level_call_stubs/stubs.c @@ -484,7 +484,7 @@ void uiLayoutSetEnabled(uiLayout *layout, bool enabled) RET_NONE void uiLayoutSetAlignment(uiLayout *layout, char alignment) RET_NONE void uiLayoutSetScaleX(struct uiLayout *layout, float scale) RET_NONE void uiLayoutSetScaleY(struct uiLayout *layout, float scale) RET_NONE -void uiTemplateIconView(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname) RET_NONE +void uiTemplateIconView(struct uiLayout *layout, struct PointerRNA *ptr, const char *propname, int show_labels) RET_NONE void ED_base_object_free_and_unlink(struct Main *bmain, struct Scene *scene, struct Base *base) RET_NONE void ED_mesh_update(struct Mesh *mesh, struct bContext *C, int calc_edges, int calc_tessface) RET_NONE void ED_mesh_vertices_add(struct Mesh *mesh, struct ReportList *reports, int count) RET_NONE |