diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 11:56:42 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-24 11:56:42 +0400 |
| commit | ad1d3dd30fa5f4c33279679e3824899fd18801b8 (patch) | |
| tree | cef4de1e42c5a8a2a1f68719452891c19a065ab7 /source/blender/editors/space_buttons | |
| parent | 77a7ec7c61965efa9e2e82894c821fe5c937b989 (diff) | |
| parent | 1bdf652b89871614c38bf2146cf94522c3347e06 (diff) | |
svn merge ^/trunk/blender -r41175:41200 --- will need to apply fix after
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_ops.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 4a2860335fe..309c5cfc218 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -925,7 +925,7 @@ void buttons_context_draw(const bContext *C, uiLayout *layout) if(ptr->data) { icon= RNA_struct_ui_icon(ptr->type); - name= RNA_struct_name_get_alloc(ptr, namebuf, sizeof(namebuf)); + name= RNA_struct_name_get_alloc(ptr, namebuf, sizeof(namebuf), NULL); if(name) { if(!ELEM(sbuts->mainb, BCONTEXT_RENDER, BCONTEXT_SCENE) && ptr->type == &RNA_Scene) diff --git a/source/blender/editors/space_buttons/buttons_ops.c b/source/blender/editors/space_buttons/buttons_ops.c index 75b3eb950a5..5dbcfbba5be 100644 --- a/source/blender/editors/space_buttons/buttons_ops.c +++ b/source/blender/editors/space_buttons/buttons_ops.c @@ -39,7 +39,6 @@ #include "BLI_fileops.h" #include "BLI_path_util.h" -#include "BLI_storage.h" #include "BLI_string.h" #include "BLI_utildefines.h" @@ -169,7 +168,7 @@ static int file_browse_invoke(bContext *C, wmOperator *op, wmEvent *event) if(!prop) return OPERATOR_CANCELLED; - str= RNA_property_string_get_alloc(&ptr, prop, NULL, 0); + str= RNA_property_string_get_alloc(&ptr, prop, NULL, 0, NULL); /* useful yet irritating feature, Shift+Click to open the file * Alt+Click to browse a folder in the OS's browser */ |