From 83360eccae531c950827fe13c1344b5bacf78dc9 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Thu, 17 Jul 2014 13:04:01 +0900 Subject: Fix for renamed API functions in rB415af0b. --- source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 2 +- source/blender/nodes/shader/node_shader_tree.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'source/blender') diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 9fc85d166e8..e662be02b87 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 = BKE_get_linestyle_from_scene(scene); + FreestyleLineStyle *linestyle = BKE_linestyle_active_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 8d5d66152f0..299172ae4cc 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -101,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 = BKE_get_linestyle_from_scene(scene); + FreestyleLineStyle *linestyle = BKE_linestyle_active_from_scene(scene); if (linestyle) { *r_from = NULL; *r_id = &linestyle->id; -- cgit v1.2.3