[Bf-blender-cvs] [4e11fce] master: Follow-up to rB647969f9b617: Renamed CTX_data_linestyle_from_scene() to BKE_get_linestyle_from_scene().

[Tamito Kajiyama]

Commit: 4e11fcead0f7262bf92e873882bf9141a749ff32
Author: Tamito Kajiyama
Date:   Wed Jul 16 13:53:00 2014 +0900
Branches: master
https://developer.blender.org/rB4e11fcead0f7262bf92e873882bf9141a749ff32

Follow-up to rB647969f9b617: Renamed CTX_data_linestyle_from_scene() to BKE_get_linestyle_from_scene().

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

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 8c98a94..9fc85d1 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 629bd7e..8d5d661 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;