[Bf-blender-cvs] [83360ec] master: Fix for renamed API functions in rB415af0b.

[Tamito Kajiyama]

Commit: 83360eccae531c950827fe13c1344b5bacf78dc9
Author: Tamito Kajiyama
Date:   Thu Jul 17 13:04:01 2014 +0900
Branches: master
https://developer.blender.org/rB83360eccae531c950827fe13c1344b5bacf78dc9

Fix for renamed API functions in rB415af0b.

===================================================================

M	source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
M	source/blender/nodes/shader/node_shader_tree.c

===================================================================

diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
index 9fc85d1..e662be0 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 8d5d661..299172a 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;