Commit: 59dd3735bf63bb95240d70344e159d7584e6c1d4
Author: Antony Riakiotakis
Date: Mon Feb 9 14:28:07 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB59dd3735bf63bb95240d70344e159d7584e6c1d4
Merge branch 'GPU_subsurf' into wiggly-widgets
Conflicts:
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/gpu/GPU_buffers.h
source/blender/gpu/intern/gpu_buffers.c
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
