From 4e11fcead0f7262bf92e873882bf9141a749ff32 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Wed, 16 Jul 2014 13:53:00 +0900 Subject: Follow-up to rB647969f9b617: Renamed CTX_data_linestyle_from_scene() to BKE_get_linestyle_from_scene(). --- source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 2 +- source/blender/nodes/shader/node_shader_tree.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 8c98a940f20..9fc85d166e8 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -736,7 +736,7 @@ void FRS_move_active_lineset_down(FreestyleConfig *config) Material *FRS_create_stroke_material(bContext *C, Main *bmain, Scene *scene) { - FreestyleLineStyle *linestyle = CTX_data_linestyle_from_scene(scene); + FreestyleLineStyle *linestyle = BKE_get_linestyle_from_scene(scene); if (!linestyle) { cout << "FRS_create_stroke_material: No active line style in the current scene" << endl; diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 629bd7eeea6..8d5d66152f0 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -49,6 +49,7 @@ #include "BKE_context.h" #include "BKE_global.h" +#include "BKE_linestyle.h" #include "BKE_main.h" #include "BKE_node.h" #include "BKE_scene.h" @@ -100,7 +101,7 @@ static void shader_get_from_context(const bContext *C, bNodeTreeType *UNUSED(tre } #ifdef WITH_FREESTYLE else if (snode->shaderfrom == SNODE_SHADER_LINESTYLE) { - FreestyleLineStyle *linestyle = CTX_data_linestyle_from_scene(scene); + FreestyleLineStyle *linestyle = BKE_get_linestyle_from_scene(scene); if (linestyle) { *r_from = NULL; *r_id = &linestyle->id; -- cgit v1.2.3