diff options
author | Ton Roosendaal <ton@blender.org> | 2006-05-28 15:49:22 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2006-05-28 15:49:22 +0400 |
commit | 2e901061d96845197f9b1f58bfe9569be74b7d2a (patch) | |
tree | 30471c133d3030d6c75e0a74c6e0a02dce2765f7 /source/blender/render/extern | |
parent | e7767e39bb1bd43c74716289c91461a1e7a5824c (diff) |
More render pipeline finishing up;
- Shaded drawmode is back (shift+z).
Note it still only uses orco texture; but lighting/shading is using
the internal render module entirely.
- "Make Sticky" option back.
(Also fix in sticky texture render, was wrong scaled)
Diffstat (limited to 'source/blender/render/extern')
-rw-r--r-- | source/blender/render/extern/include/RE_pipeline.h | 4 | ||||
-rw-r--r-- | source/blender/render/extern/include/RE_shader_ext.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/source/blender/render/extern/include/RE_pipeline.h b/source/blender/render/extern/include/RE_pipeline.h index f0087ef6cce..ae82ffb0128 100644 --- a/source/blender/render/extern/include/RE_pipeline.h +++ b/source/blender/render/extern/include/RE_pipeline.h @@ -182,5 +182,9 @@ float RE_filter_value(int type, float x); /* vector blur zbuffer method */ void RE_zbuf_accumulate_vecblur(struct NodeBlurData *nbd, int xsize, int ysize, float *newrect, float *imgrect, float *vecbufrect, float *zbufrect); +/* shaded view options */ +void RE_Database_Shaded(struct Render *re, struct Scene *scene); +void RE_DataBase_GetView(struct Render *re, float mat[][4]); + #endif /* RE_PIPELINE_H */ diff --git a/source/blender/render/extern/include/RE_shader_ext.h b/source/blender/render/extern/include/RE_shader_ext.h index 59f6da40f5e..f9015dc1161 100644 --- a/source/blender/render/extern/include/RE_shader_ext.h +++ b/source/blender/render/extern/include/RE_shader_ext.h @@ -114,5 +114,10 @@ typedef struct ShadeInput struct Tex; int multitex_ext(struct Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, struct TexResult *texres); +/* shaded view */ +struct Render; +void RE_shade_external(struct Render *re, struct ShadeInput *shi, struct ShadeResult *shr); + + #endif /* RE_SHADER_EXT_H */ |