diff options
author | Ton Roosendaal <ton@blender.org> | 2008-11-12 22:03:50 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-11-12 22:03:50 +0300 |
commit | 8030cb03fd41673b7d687128782a0e21417baaea (patch) | |
tree | b2e25d9a91ecf3713c45a4263f88a934e973e593 /source/blender/include | |
parent | 3fd3a13efc81ce3eafadd5ab31a154bbc25d6e58 (diff) |
Patch #7897 Texture Nodes!
Robin (Frrr) Allen did a decent job on this, so we can also welcome him
as a member in the svn committers team to maintain it!
I do the first commit with some minor fixes:
- get Makefiles work
- fix rounding issue with tiles on unit faces
- removed UI includes from tex node
A nice doc in wiki is here:
http://wiki.blender.org/index.php/User:Frr/TexnodeManual
On the todo for Robin is:
- When using one or more Texture-input nodes, you cannot edit them by activating
(as works now for Material nodes).
- The new "output node" option fails on the default case, when only one
output node is active. It then shows often a blank menu. Will get fixed asap.
- When using a NodeTree-Texture as input node, the menu for 'active output'
should not show. NodeTree should ignore other nodetrees to keep things sane
for now.
- On a future todo is proper usage of "Dxt" and "Dyt" texture vectors for
superior antialising of checkers/bricks.
General note; I know people are dying to get a full integrated shader system
with nodes. In theory we could merge this with Material Nodetrees... but I
rather wait for a solid and very well thought out design proposal for this,
also including design ideas for unifying with a shader language (GPU, CPU).
For the time being this is a nice extension of current textures. :)
Diffstat (limited to 'source/blender/include')
-rw-r--r-- | source/blender/include/BSE_node.h | 1 | ||||
-rw-r--r-- | source/blender/include/blendef.h | 1 | ||||
-rw-r--r-- | source/blender/include/butspace.h | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/include/BSE_node.h b/source/blender/include/BSE_node.h index 0e9e511e9e6..d0656f09a46 100644 --- a/source/blender/include/BSE_node.h +++ b/source/blender/include/BSE_node.h @@ -81,6 +81,7 @@ void node_active_link_viewer(struct SpaceNode *snode); void node_transform_ext(int mode, int unused); void node_shader_default(struct Material *ma); void node_composit_default(struct Scene *scene); +void node_texture_default(struct Tex *tx); int node_has_hidden_sockets(struct bNode *node); diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index 50179325609..60d3a589c51 100644 --- a/source/blender/include/blendef.h +++ b/source/blender/include/blendef.h @@ -415,6 +415,7 @@ /* NODE: 851-900 */ #define B_NODE_USEMAT 851 #define B_NODE_USESCENE 852 +#define B_NODE_USETEX 853 /* FREE 901 - 999 */ diff --git a/source/blender/include/butspace.h b/source/blender/include/butspace.h index 8cac5a074ab..fd3f6e926b9 100644 --- a/source/blender/include/butspace.h +++ b/source/blender/include/butspace.h @@ -258,6 +258,7 @@ void curvemap_buttons(struct uiBlock *block, struct CurveMapping *cumap, char la #define B_ENV_OB 1354 #define B_ENV_FREE_ALL 1357 +#define B_TEX_USENODES 1358 /* **************** animbuts = object buttons ******* */ |