Blender Git Loki
Git Commits -> Revision 7292917
Revision 7292917 by Brecht Van Lommel (master) November 4, 2011, 20:58 (GMT) |
Cycles: add location/rotate/scale and XYZ mapping options for all texture nodes, to reduce the amount of nodes needed to set up a simple texture. These are currently editable in the texture properties tab, still need to make them available in the node editor. Projection and color modification options will be added later, they're not implemented yet but allocated already to avoid version patches later. Also an issue with the XYZ mapping is that when you set one to None, texture and material draw mode doesn't draw the image texture well, OpenGL doesn't seem to like the degenerate texture matrix? |
Commit Details:
Full Hash: 72929172dd0d3d51edf7b5b0cbcc9296ce0bb4da
SVN Revision: 41533
Parent Commit: 942d2fe
Lines Changed: +570, -156
38 Modified Paths:
/intern/cycles/blender/addon/ui.py (+48, -7) (Diff)
/intern/cycles/blender/blender_shader.cpp (+28, -5) (Diff)
/intern/cycles/render/nodes.cpp (+3, -3) (Diff)
/intern/cycles/render/nodes.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_texture.h (+5, -2) (Diff)
/source/blender/blenkernel/intern/texture.c (+79, -16) (Diff)
/source/blender/blenloader/intern/readfile.c (+41, -0) (Diff)
/source/blender/editors/include/ED_uvedit.h (+2, -1) (Diff)
/source/blender/editors/interface/interface_node.c (+5, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+2, -2) (Diff)
/source/blender/editors/space_image/space_image.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+8, -7) (Diff)
/source/blender/editors/space_node/node_draw.c (+2, -1) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+18, -2) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+3, -1) (Diff)
/source/blender/makesdna/DNA_node_types.h (+22, -0) (Diff)
/source/blender/makesdna/DNA_texture_types.h (+19, -3) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+38, -50) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+6, -4) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+142, -34) (Diff)
/source/blender/nodes/composite/nodes/node_composite_mapValue.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_mapping.c (+3, -3) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_blend.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_clouds.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_distnoise.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_environment.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_image.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_magic.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_marble.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_noise.c (+13, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_sky.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_stucci.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_wood.c (+5, -1) (Diff)
/source/blender/nodes/shader/node_shader_util.c (+21, -0) (Diff)
/source/blender/nodes/shader/node_shader_util.h (+1, -0) (Diff)
/intern/cycles/blender/blender_shader.cpp (+28, -5) (Diff)
/intern/cycles/render/nodes.cpp (+3, -3) (Diff)
/intern/cycles/render/nodes.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_texture.h (+5, -2) (Diff)
/source/blender/blenkernel/intern/texture.c (+79, -16) (Diff)
/source/blender/blenloader/intern/readfile.c (+41, -0) (Diff)
/source/blender/editors/include/ED_uvedit.h (+2, -1) (Diff)
/source/blender/editors/interface/interface_node.c (+5, -0) (Diff)
/source/blender/editors/sculpt_paint/paint_image.c (+2, -2) (Diff)
/source/blender/editors/space_image/space_image.c (+1, -1) (Diff)
/source/blender/editors/space_node/drawnode.c (+8, -7) (Diff)
/source/blender/editors/space_node/node_draw.c (+2, -1) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+18, -2) (Diff)
/source/blender/editors/uvedit/uvedit_ops.c (+3, -1) (Diff)
/source/blender/makesdna/DNA_node_types.h (+22, -0) (Diff)
/source/blender/makesdna/DNA_texture_types.h (+19, -3) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+38, -50) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+6, -4) (Diff)
/source/blender/makesrna/intern/rna_texture.c (+142, -34) (Diff)
/source/blender/nodes/composite/nodes/node_composite_mapValue.c (+1, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_mapping.c (+3, -3) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_blend.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_clouds.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_distnoise.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_environment.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_image.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_magic.c (+4, -0) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_marble.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_noise.c (+13, -2) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_sky.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_stucci.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c (+5, -1) (Diff)
/source/blender/nodes/shader/nodes/node_shader_tex_wood.c (+5, -1) (Diff)
/source/blender/nodes/shader/node_shader_util.c (+21, -0) (Diff)
/source/blender/nodes/shader/node_shader_util.h (+1, -0) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021