Blender Git Loki
Git Commits -> Revision faec430
Revision faec430 by Bastien Montagne (master) May 24, 2016, 14:48 (GMT) |
Merge branch 'master' into blender2.8 Conflicts: intern/cycles/blender/blender_curves.cpp source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/particle.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/physics/particle_edit.c source/blender/editors/transform/transform_snap_object.c source/blender/editors/util/undo.c source/blender/makesrna/intern/rna_object_force.c |
Commit Details:
Full Hash: faec4309147988fbab7b7d7ec661f5130358d169
Parent Commits: e1dd83b, f85745b