diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-22 20:25:02 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-22 20:25:02 +0300 |
| commit | 0fd7310b5133aa57a4307c4cb19e44531d723ec1 (patch) | |
| tree | e7f53b574f38102916bbb09cb403b472bc4373a9 /source/blender/editors/sculpt_paint/paint_stroke.c | |
| parent | 83a2d3dcf5a73f907c741038d5c55cb9f7aff1f9 (diff) | |
| parent | 6ec01dcbf29104a6f323b54f8afb2adfd2163ada (diff) | |
Merge branch 'wiggly-widgets' into UI-experimentsUI-experiments
Conflicts:
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_manipulator.c
Diffstat (limited to 'source/blender/editors/sculpt_paint/paint_stroke.c')
0 files changed, 0 insertions, 0 deletions