diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-09 15:32:55 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2010-08-09 15:32:55 +0400 |
commit | dd75ec490761640571a0d8e53a0d439091f2736f (patch) | |
tree | 25b3966862febbf3ee8c81ed45f7045c99f84016 /source/blender/editors/space_buttons/buttons_context.c | |
parent | 02b0967bd11dd6fd2454b37182d9f94ea451b603 (diff) | |
parent | c026b8066ddc1c42144d2e5132384ea7c1211050 (diff) |
Merged changes in the trunk up to revision 31190.
Diffstat (limited to 'source/blender/editors/space_buttons/buttons_context.c')
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 5 |
1 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 da6f9fa3f1e..343237dee5e 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -36,11 +36,11 @@ #include "DNA_node_types.h" #include "DNA_scene_types.h" #include "DNA_world_types.h" +#include "DNA_brush_types.h" #include "BLI_listbase.h" #include "BKE_context.h" -#include "BKE_global.h" #include "BKE_action.h" #include "BKE_material.h" #include "BKE_modifier.h" @@ -49,7 +49,6 @@ #include "BKE_screen.h" #include "BKE_texture.h" #include "BKE_utildefines.h" -#include "BKE_world.h" #include "RNA_access.h" @@ -342,7 +341,7 @@ static int buttons_context_path_brush(const bContext *C, ButsContextPath *path) br= paint_brush(paint_get_active(scene)); if(br) { - RNA_id_pointer_create(&br->id, &path->ptr[path->len]); + RNA_id_pointer_create((ID *)br, &path->ptr[path->len]); path->len++; return 1; |