Blender Git Loki
Git Commits -> Revision a5c6f3d
Revision a5c6f3d by Brecht Van Lommel (master) June 14, 2011, 16:05 (GMT) |
Cycles: more work on texturing UI, now texture nodes use same nodes as shading, only rough implementation for design proposal. |
Commit Details:
Full Hash: a5c6f3d53b8c25500395dd1ab1c556c4f502c214
SVN Revision: 37479
Parent Commit: 9097fdc
Lines Changed: +1442, -104
2 Added Paths:
/source/blender/nodes/intern/SHD_nodes/SHD_noise.h (+472, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_output_texture.c (+72, -0) (View)
/source/blender/nodes/intern/SHD_nodes/SHD_output_texture.c (+72, -0) (View)
47 Modified Paths:
/intern/cycles/blender/addon/ui.py (+53, -6) (Diff)
/release/scripts/startup/bl_ui/properties_texture.py (+1, -1) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+18, -1) (Diff)
/source/blender/editors/interface/interface_node.c (+10, -2) (Diff)
/source/blender/editors/render/render_shading.c (+6, -2) (Diff)
/source/blender/editors/space_node/node_draw.c (+2, -0) (Diff)
/source/blender/editors/space_node/node_edit.c (+10, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_background.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_emission.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_fresnel.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_light_path.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_lamp.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_material.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_world.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c (+58, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_clouds.c (+38, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_coord.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_distnoise.c (+35, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c (+31, -4) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c (+26, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_magic.c (+87, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_marble.c (+41, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_musgrave.c (+205, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_noise.c (+31, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_sky.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_stucci.c (+38, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_voronoi.c (+80, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_wood.c (+44, -3) (Diff)
/source/blender/nodes/intern/SHD_util.c (+1, -0) (Diff)
/source/blender/nodes/intern/SHD_util.h (+5, -0) (Diff)
/source/blender/nodes/intern/TEX_util.c (+38, -23) (Diff)
/source/blender/nodes/SHD_node.h (+1, -0) (Diff)
/source/blender/render/intern/source/render_texture.c (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_texture.py (+1, -1) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+18, -1) (Diff)
/source/blender/editors/interface/interface_node.c (+10, -2) (Diff)
/source/blender/editors/render/render_shading.c (+6, -2) (Diff)
/source/blender/editors/space_node/node_draw.c (+2, -0) (Diff)
/source/blender/editors/space_node/node_edit.c (+10, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree_types.h (+1, -0) (Diff)
/source/blender/nodes/CMakeLists.txt (+1, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_add_closure.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_attribute.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_background.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_anisotropic.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_diffuse.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glass.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_glossy.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_translucent.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_transparent.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_bsdf_velvet.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_emission.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_fresnel.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_geometry.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_light_path.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_mix_closure.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_lamp.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_material.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_output_world.c (+1, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c (+58, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_clouds.c (+38, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_coord.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_distnoise.c (+35, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c (+31, -4) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c (+26, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_magic.c (+87, -1) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_marble.c (+41, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_musgrave.c (+205, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_noise.c (+31, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_sky.c (+2, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_stucci.c (+38, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_voronoi.c (+80, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_wood.c (+44, -3) (Diff)
/source/blender/nodes/intern/SHD_util.c (+1, -0) (Diff)
/source/blender/nodes/intern/SHD_util.h (+5, -0) (Diff)
/source/blender/nodes/intern/TEX_util.c (+38, -23) (Diff)
/source/blender/nodes/SHD_node.h (+1, -0) (Diff)
/source/blender/render/intern/source/render_texture.c (+2, -2) (Diff)