[Bf-blender-cvs] [ea1f54d] master: Fix for hard-coded #include file paths.
Tamito Kajiyama
noreply at git.blender.org
Tue Aug 12 03:16:51 CEST 2014
Commit: ea1f54d8f3596a012629890acf8d17e66fcb19e6
Author: Tamito Kajiyama
Date: Fri Jun 27 16:00:22 2014 +0900
Branches: master
https://developer.blender.org/rBea1f54d8f3596a012629890acf8d17e66fcb19e6
Fix for hard-coded #include file paths.
===================================================================
M source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
===================================================================
diff --git a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
index 18989a9..55b406c 100644
--- a/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
+++ b/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp
@@ -30,6 +30,8 @@
extern "C" {
#include "MEM_guardedalloc.h"
+#include "RNA_access.h"
+
#include "DNA_camera_types.h"
#include "DNA_listBase.h"
#include "DNA_material_types.h"
@@ -53,9 +55,6 @@ extern "C" {
#include "RE_pipeline.h"
-#include "C:\bf-blender\blender.git\source\blender\nodes\NOD_shader.h"
-#include "C:\bf-blender\blender.git\source\blender\makesrna\RNA_access.h"
-
#include "render_types.h"
}
@@ -269,7 +268,7 @@ void BlenderStrokeRenderer::RenderStrokeRep(StrokeRep *iStrokeRep) const
BLI_assert(BKE_scene_use_new_shading_nodes(freestyle_scene));
- ntree = ntreeAddTree(NULL, "Shader Nodetree", ntreeType_Shader->idname);
+ ntree = ntreeAddTree(NULL, "stroke_material", "ShaderNodeTree");
ma->nodetree = ntree;
ma->use_nodes = 1;
More information about the Bf-blender-cvs
mailing list