Blender Git Loki
Git Commits -> Revision 418b245
Revision 418b245 by Dalai Felinto (pbr-viewport) October 20, 2016, 17:00 (GMT) |
Merge commit '9269574089a742130f02c0a1184a19d94f0e665d' into pbr-online Merge conflicts fixes include fix on ob->reflectionplane for write and read, and a few manual fixes to account for the ID remap changes Conflicts: source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/world.c source/blender/blenloader/intern/writefile.c source/blender/editors/space_view3d/view3d_draw.c source/blender/gpu/GPU_draw.h source/blender/gpu/intern/gpu_draw.c source/blender/gpu/intern/gpu_material.c source/blender/gpu/intern/gpu_texture.c source/blender/gpu/shaders/gpu_shader_vertex_world.glsl |
Commit Details:
Full Hash: 418b24551e1b8a4458deceedca945a631f0684ac
Parent Commits: 9269574, a84794b