archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

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

Browse Source
This commit is contained in:
Tamito Kajiyama
2014-07-16 13:53:00 +09:00
parent fc85446c50
commit 4e11fcead0
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
View File

@@ -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;

3
source/blender/nodes/shader/node_shader_tree.c
View File

@@ -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;