Blender Git Loki
Git Commits -> Revision 1cf0af7
Revision 1cf0af7 by Brecht Van Lommel (master) June 27, 2011, 17:10 (GMT) |
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. |
Commit Details:
Full Hash: 1cf0af703d0a7c18e0d03e5fd4fb9f0a0597b629
SVN Revision: 37871
Parent Commit: d28fc39
Lines Changed: +2522, -1757
56 Modified Paths:
/intern/cycles/blender/addon/ui.py (+40, -19) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+0, -1) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+10, -2) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_scene.h (+2, -0) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+129, -28) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+138, -0) (Diff)
/source/blender/blenkernel/intern/material.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+59, -14) (Diff)
/source/blender/blenkernel/intern/scene.c (+7, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+150, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+2, -2) (Diff)
/source/blender/editors/include/ED_node.h (+2, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+4, -3) (Diff)
/source/blender/editors/interface/interface_node.c (+51, -48) (Diff)
/source/blender/editors/interface/interface_templates.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_widgets.c (+4, -0) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+13, -3) (Diff)
/source/blender/editors/space_buttons/buttons_intern.h (+7, -0) (Diff)
/source/blender/editors/space_buttons/buttons_texture.c (+59, -15) (Diff)
/source/blender/editors/space_node/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/space_node/node_edit.c (+50, -21) (Diff)
/source/blender/editors/space_node/node_intern.h (+0, -1) (Diff)
/source/blender/editors/space_node/node_select.c (+3, -1) (Diff)
/source/blender/editors/space_node/SConscript (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+244, -134) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+7, -9) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+3, -3) (Diff)
/source/blender/gpu/GPU_extensions.h (+1, -0) (Diff)
/source/blender/gpu/GPU_material.h (+2, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+12, -7) (Diff)
/source/blender/gpu/intern/gpu_material.c (+24, -9) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+18, -11) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+1406, -1401) (Diff)
/source/blender/makesdna/DNA_node_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+3, -1) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+3, -7) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+0, -4) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_clouds.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_distnoise.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c (+9, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c (+8, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_magic.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_marble.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_musgrave.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_noise.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_sky.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_stucci.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_voronoi.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_wood.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_util.h (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+0, -1) (Diff)
/source/blender/blenkernel/BKE_DerivedMesh.h (+10, -2) (Diff)
/source/blender/blenkernel/BKE_node.h (+1, -0) (Diff)
/source/blender/blenkernel/BKE_scene.h (+2, -0) (Diff)
/source/blender/blenkernel/intern/cdderivedmesh.c (+129, -28) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+138, -0) (Diff)
/source/blender/blenkernel/intern/material.c (+4, -0) (Diff)
/source/blender/blenkernel/intern/node.c (+59, -14) (Diff)
/source/blender/blenkernel/intern/scene.c (+7, -1) (Diff)
/source/blender/blenkernel/intern/subsurf_ccg.c (+150, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+2, -2) (Diff)
/source/blender/editors/include/ED_node.h (+2, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+4, -3) (Diff)
/source/blender/editors/interface/interface_node.c (+51, -48) (Diff)
/source/blender/editors/interface/interface_templates.c (+1, -1) (Diff)
/source/blender/editors/interface/interface_widgets.c (+4, -0) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+13, -3) (Diff)
/source/blender/editors/space_buttons/buttons_intern.h (+7, -0) (Diff)
/source/blender/editors/space_buttons/buttons_texture.c (+59, -15) (Diff)
/source/blender/editors/space_node/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/space_node/node_edit.c (+50, -21) (Diff)
/source/blender/editors/space_node/node_intern.h (+0, -1) (Diff)
/source/blender/editors/space_node/node_select.c (+3, -1) (Diff)
/source/blender/editors/space_node/SConscript (+1, -1) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+244, -134) (Diff)
/source/blender/editors/space_view3d/drawobject.c (+7, -9) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+3, -3) (Diff)
/source/blender/gpu/GPU_extensions.h (+1, -0) (Diff)
/source/blender/gpu/GPU_material.h (+2, -1) (Diff)
/source/blender/gpu/intern/gpu_draw.c (+12, -7) (Diff)
/source/blender/gpu/intern/gpu_material.c (+24, -9) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl (+18, -11) (Diff)
/source/blender/gpu/intern/gpu_shader_material.glsl.c (+1406, -1401) (Diff)
/source/blender/makesdna/DNA_node_types.h (+2, -1) (Diff)
/source/blender/makesdna/DNA_object_types.h (+3, -1) (Diff)
/source/blender/makesdna/DNA_view3d_types.h (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+5, -0) (Diff)
/source/blender/makesrna/intern/rna_space.c (+3, -7) (Diff)
/source/blender/makesrna/intern/rna_ui_api.c (+0, -4) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_blend.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_clouds.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_distnoise.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_environment.c (+9, -3) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_image.c (+8, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_magic.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_marble.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_musgrave.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_noise.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_sky.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_stucci.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_voronoi.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_tex_wood.c (+3, -0) (Diff)
/source/blender/nodes/intern/SHD_util.h (+1, -0) (Diff)
/source/gameengine/Ketsji/BL_BlenderShader.cpp (+1, -1) (Diff)
/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp (+1, -1) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021