Blender Git Commit Log
Git Commits -> Revision 8469284
Revision 8469284 by Brecht Van Lommel (master) June 11, 2018, 15:06 (GMT) |
Fix merge error in 908b696, removed files were accidentally added back. |
Commit Details:
Full Hash: 84692844a3d6493ce0649c5021ec92e684b59a86
Parent Commit: 27b6734
Lines Changed: +0, -33968
47 Deleted Paths:
/source/blender/nodes/shader/nodes/node_shader_geom.c (+0, -163)
/source/blender/nodes/shader/nodes/node_shader_material.c (+0, -374)
/source/blender/nodes/shader/nodes/node_shader_output.c (+0, -97)
/source/blender/nodes/shader/nodes/node_shader_texture.c (+0, -166)
/source/blender/render/intern/include/envmap.h (+0, -54)
/source/blender/render/intern/include/pixelblending.h (+0, -65)
/source/blender/render/intern/include/pixelshading.h (+0, -62)
/source/blender/render/intern/include/pointdensity.h (+0, -51)
/source/blender/render/intern/include/raycounter.h (+0, -74)
/source/blender/render/intern/include/rayintersection.h (+0, -136)
/source/blender/render/intern/include/rendercore.h (+0, -105)
/source/blender/render/intern/include/shading.h (+0, -105)
/source/blender/render/intern/include/strand.h (+0, -99)
/source/blender/render/intern/include/sunsky.h (+0, -81)
/source/blender/render/intern/include/texture_ocean.h (+0, -35)
/source/blender/render/intern/include/voxeldata.h (+0, -47)
/source/blender/render/intern/raytrace/bvh.h (+0, -407)
/source/blender/render/intern/raytrace/rayobject.cpp (+0, -534)
/source/blender/render/intern/raytrace/rayobject_hint.h (+0, -72)
/source/blender/render/intern/raytrace/rayobject_instance.cpp (+0, -211)
/source/blender/render/intern/raytrace/rayobject_octree.cpp (+0, -1101)
/source/blender/render/intern/raytrace/rayobject_qbvh.cpp (+0, -160)
/source/blender/render/intern/raytrace/rayobject_raycounter.cpp (+0, -91)
/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp (+0, -531)
/source/blender/render/intern/raytrace/rayobject_rtbuild.h (+0, -125)
/source/blender/render/intern/raytrace/rayobject_svbvh.cpp (+0, -192)
/source/blender/render/intern/raytrace/rayobject_vbvh.cpp (+0, -206)
/source/blender/render/intern/raytrace/reorganize.h (+0, -513)
/source/blender/render/intern/raytrace/svbvh.h (+0, -317)
/source/blender/render/intern/raytrace/vbvh.h (+0, -238)
/source/blender/render/intern/source/bake.c (+0, -1342)
/source/blender/render/intern/source/convertblender.c (+0, -6014)
/source/blender/render/intern/source/envmap.c (+0, -822)
/source/blender/render/intern/source/occlusion.c (+0, -1533)
/source/blender/render/intern/source/pixelblending.c (+0, -400)
/source/blender/render/intern/source/pixelshading.c (+0, -650)
/source/blender/render/intern/source/rayshade.c (+0, -2503)
/source/blender/render/intern/source/rendercore.c (+0, -2030)
/source/blender/render/intern/source/renderdatabase.c (+0, -1603)
/source/blender/render/intern/source/shadbuf.c (+0, -2647)
/source/blender/render/intern/source/shadeinput.c (+0, -1490)
/source/blender/render/intern/source/shadeoutput.c (+0, -2182)
/source/blender/render/intern/source/sss.c (+0, -1074)
/source/blender/render/intern/source/strand.c (+0, -1069)
/source/blender/render/intern/source/sunsky.c (+0, -506)
/source/blender/render/intern/source/volumetric.c (+0, -836)
/source/blender/render/intern/source/volume_precache.c (+0, -855)
/source/blender/nodes/shader/nodes/node_shader_material.c (+0, -374)
/source/blender/nodes/shader/nodes/node_shader_output.c (+0, -97)
/source/blender/nodes/shader/nodes/node_shader_texture.c (+0, -166)
/source/blender/render/intern/include/envmap.h (+0, -54)
/source/blender/render/intern/include/pixelblending.h (+0, -65)
/source/blender/render/intern/include/pixelshading.h (+0, -62)
/source/blender/render/intern/include/pointdensity.h (+0, -51)
/source/blender/render/intern/include/raycounter.h (+0, -74)
/source/blender/render/intern/include/rayintersection.h (+0, -136)
/source/blender/render/intern/include/rendercore.h (+0, -105)
/source/blender/render/intern/include/shading.h (+0, -105)
/source/blender/render/intern/include/strand.h (+0, -99)
/source/blender/render/intern/include/sunsky.h (+0, -81)
/source/blender/render/intern/include/texture_ocean.h (+0, -35)
/source/blender/render/intern/include/voxeldata.h (+0, -47)
/source/blender/render/intern/raytrace/bvh.h (+0, -407)
/source/blender/render/intern/raytrace/rayobject.cpp (+0, -534)
/source/blender/render/intern/raytrace/rayobject_hint.h (+0, -72)
/source/blender/render/intern/raytrace/rayobject_instance.cpp (+0, -211)
/source/blender/render/intern/raytrace/rayobject_octree.cpp (+0, -1101)
/source/blender/render/intern/raytrace/rayobject_qbvh.cpp (+0, -160)
/source/blender/render/intern/raytrace/rayobject_raycounter.cpp (+0, -91)
/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp (+0, -531)
/source/blender/render/intern/raytrace/rayobject_rtbuild.h (+0, -125)
/source/blender/render/intern/raytrace/rayobject_svbvh.cpp (+0, -192)
/source/blender/render/intern/raytrace/rayobject_vbvh.cpp (+0, -206)
/source/blender/render/intern/raytrace/reorganize.h (+0, -513)
/source/blender/render/intern/raytrace/svbvh.h (+0, -317)
/source/blender/render/intern/raytrace/vbvh.h (+0, -238)
/source/blender/render/intern/source/bake.c (+0, -1342)
/source/blender/render/intern/source/convertblender.c (+0, -6014)
/source/blender/render/intern/source/envmap.c (+0, -822)
/source/blender/render/intern/source/occlusion.c (+0, -1533)
/source/blender/render/intern/source/pixelblending.c (+0, -400)
/source/blender/render/intern/source/pixelshading.c (+0, -650)
/source/blender/render/intern/source/rayshade.c (+0, -2503)
/source/blender/render/intern/source/rendercore.c (+0, -2030)
/source/blender/render/intern/source/renderdatabase.c (+0, -1603)
/source/blender/render/intern/source/shadbuf.c (+0, -2647)
/source/blender/render/intern/source/shadeinput.c (+0, -1490)
/source/blender/render/intern/source/shadeoutput.c (+0, -2182)
/source/blender/render/intern/source/sss.c (+0, -1074)
/source/blender/render/intern/source/strand.c (+0, -1069)
/source/blender/render/intern/source/sunsky.c (+0, -506)
/source/blender/render/intern/source/volumetric.c (+0, -836)
/source/blender/render/intern/source/volume_precache.c (+0, -855)