Cycles: working towards texture workflow design
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 27 Jun 2011 17:10:50 +0000 (17:10 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Mon, 27 Jun 2011 17:10:50 +0000 (17:10 +0000)
commit1cf0af703d0a7c18e0d03e5fd4fb9f0a0597b629
tree68b2b7f330a30ce84069f92f7432f0c6e60f0621
parentd28fc39ff50a7afbe5f456ed5558b5aea4797d15
Cycles: working towards texture workflow design
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/TextureWorkflow

* Added "active texture node" in shading node trees.
* Texture draw mode draw active texture node now, and new Material draw
  mode shows GLSL material.
* GLSL materials now match solid draw mode lighting better.
* Texture properties can now texture nodes from material/world/lamp.
56 files changed:
intern/cycles/blender/addon/ui.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_DerivedMesh.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/BKE_scene.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/cdderivedmesh.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/scene.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_node.h
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_node.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_buttons/buttons_intern.h
source/blender/editors/space_buttons/buttons_texture.c
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_node/SConscript
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_intern.h
source/blender/editors/space_node/node_select.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/gpu/GPU_extensions.h
source/blender/gpu/GPU_material.h
source/blender/gpu/intern/gpu_draw.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_shader_material.glsl
source/blender/gpu/intern/gpu_shader_material.glsl.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesdna/DNA_object_types.h
source/blender/makesdna/DNA_view3d_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_ui_api.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_clouds.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_distnoise.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_magic.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_marble.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_musgrave.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_noise.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_sky.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_stucci.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_voronoi.c
source/blender/nodes/intern/SHD_nodes/SHD_tex_wood.c
source/blender/nodes/intern/SHD_util.h
source/gameengine/Ketsji/BL_BlenderShader.cpp
source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp