diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-07-19 10:38:56 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2014-08-12 05:10:35 +0400 |
commit | c38e80d6322b942fd2a893f4f294a919ed6e6b99 (patch) | |
tree | 67470e7670d5975085a5a211a3c5aab9cef4aa51 /source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | |
parent | a2a2d4679ae28dbc9f6bed1c8663cea9ccb71176 (diff) |
WIP commit just for a record of a working snapshot of code revisions for node-based textured strokes.
Diffstat (limited to 'source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp')
-rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 7 |
1 files changed, 5 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 e662be02b87..f6557445d48 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -50,6 +50,7 @@ extern "C" { #include "BKE_library.h" #include "BKE_linestyle.h" #include "BKE_main.h" +#include "BKE_scene.h" #include "BKE_text.h" #include "BKE_context.h" @@ -294,6 +295,8 @@ static bool test_edge_type_conditions(struct edge_type_condition *conditions, static void prepare(Main *bmain, Render *re, SceneRenderLayer *srl) { + const bool use_shading_nodes = BKE_scene_use_new_shading_nodes(re->scene); + // load mesh re->i.infostr = "Freestyle: Mesh loading"; re->stats_draw(re->sdh, &re->i); @@ -328,7 +331,7 @@ static void prepare(Main *bmain, Render *re, SceneRenderLayer *srl) cout << " (" << module_conf->script->name << ")"; cout << endl; } - controller->InsertStyleModule(layer_count, id_name, NULL, module_conf->script); + controller->InsertStyleModule(layer_count, id_name, module_conf->script, NULL, use_shading_nodes); controller->toggleLayer(layer_count, true); layer_count++; } @@ -369,7 +372,7 @@ static void prepare(Main *bmain, Render *re, SceneRenderLayer *srl) (lineset->linestyle ? (lineset->linestyle->id.name + 2) : "<NULL>") << endl; } Text *text = create_lineset_handler(bmain, srl->name, lineset->name); - controller->InsertStyleModule(layer_count, lineset->name, lineset->linestyle, text); + controller->InsertStyleModule(layer_count, lineset->name, text, lineset->linestyle, use_shading_nodes); controller->toggleLayer(layer_count, true); if (!(lineset->selection & FREESTYLE_SEL_EDGE_TYPES) || !lineset->edge_types) { ++use_ridges_and_valleys; |