Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-08-01 05:18:25 +0400
committerTamito Kajiyama <rd6t-kjym@asahi-net.or.jp>2014-08-12 05:10:55 +0400
commitb65a0228920df21b7f5a0a057bc9ad5fad64e4b3 (patch)
treecf4e3b88c1c5bf509144d24a299528837a8049df /source/blender/freestyle/FRS_freestyle.h
parentb941ab972d1e6d7e55eaa5ad509b50a25f8100ce (diff)
Freestyle: Removed the stored bContext from the Controller class.
The stored context object was used for creation of shade nodes. A closer look at the node system showed that the context is not actually used when shader nodes are added to a shader node tree. Relying on this fact, now a NULL pointer is passed to nodeAddStaticNode() instead of the stored bContext pointer.
Diffstat (limited to 'source/blender/freestyle/FRS_freestyle.h')
-rw-r--r--source/blender/freestyle/FRS_freestyle.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h
index 3777f8dfd49..fc9fc35e410 100644
--- a/source/blender/freestyle/FRS_freestyle.h
+++ b/source/blender/freestyle/FRS_freestyle.h
@@ -33,7 +33,6 @@ struct Render;
struct Material;
struct FreestyleConfig;
struct FreestyleLineStyle;
-struct bContext;
extern struct Scene *freestyle_scene;
extern float freestyle_viewpoint[3];
@@ -60,7 +59,7 @@ void FRS_move_active_lineset_up(struct FreestyleConfig *config);
void FRS_move_active_lineset_down(struct FreestyleConfig *config);
/* Testing */
-struct Material *FRS_create_stroke_material(struct bContext *C, struct Main *bmain, struct FreestyleLineStyle *linestyle);
+struct Material *FRS_create_stroke_material(struct Main *bmain, struct FreestyleLineStyle *linestyle);
#ifdef __cplusplus
}