diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-16 08:36:39 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-16 08:38:58 +0400 |
commit | 647969f9b617b0ef6d49d7502aef7c1035769bc0 (patch) | |
tree | 99acc628ef513e3d542f1c384eddbd2bc923b2ba /source/blender/editors | |
parent | de379c05dea561fbd02dc875fd7f4ae6178579b5 (diff) |
Renamed CTX_data_linestyle_from_scene() to BKE_get_linestyle_from_scene().
The function is to retrieve the active line style ID datablock from a scene and
there is nothing related to bContext.
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/space_buttons/buttons_context.c | 3 | ||||
-rw-r--r-- | source/blender/editors/space_buttons/buttons_texture.c | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_buttons/buttons_context.c b/source/blender/editors/space_buttons/buttons_context.c index 5fcceb25e4e..fc9ac27b5b8 100644 --- a/source/blender/editors/space_buttons/buttons_context.c +++ b/source/blender/editors/space_buttons/buttons_context.c @@ -55,6 +55,7 @@ #include "BKE_particle.h" #include "BKE_screen.h" #include "BKE_texture.h" +#include "BKE_linestyle.h" #include "RNA_access.h" @@ -153,7 +154,7 @@ static int buttons_context_path_linestyle(ButsContextPath *path) /* if we have a scene, use the lineset's linestyle */ else if (buttons_context_path_scene(path)) { scene = path->ptr[path->len - 1].data; - linestyle = CTX_data_linestyle_from_scene(scene); + linestyle = BKE_get_linestyle_from_scene(scene); if (linestyle) { RNA_id_pointer_create(&linestyle->id, &path->ptr[path->len]); path->len++; diff --git a/source/blender/editors/space_buttons/buttons_texture.c b/source/blender/editors/space_buttons/buttons_texture.c index 0aa3e47df4b..930a05088b1 100644 --- a/source/blender/editors/space_buttons/buttons_texture.c +++ b/source/blender/editors/space_buttons/buttons_texture.c @@ -53,8 +53,8 @@ #include "DNA_world_types.h" #include "DNA_linestyle_types.h" - #include "BKE_context.h" +#include "BKE_linestyle.h" #include "BKE_material.h" #include "BKE_modifier.h" #include "BKE_node.h" @@ -352,7 +352,7 @@ static void buttons_texture_users_from_context(ListBase *users, const bContext * ob = (scene->basact) ? scene->basact->object : NULL; wrld = scene->world; brush = BKE_paint_brush(BKE_paint_get_active_from_context(C)); - linestyle = CTX_data_linestyle_from_scene(scene); + linestyle = BKE_get_linestyle_from_scene(scene); } if (ob && ob->type == OB_LAMP && !la) |