Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

blender-embree3
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents

Snippets Groups Projects

dc08df65

Commit dc08df65 authored Mar 16, 2018 by Bastien Montagne

Downloads
- Plain Diff

Merge branch 'master' into blender2.8

parents e15591a1 5389964e

Branches

No related tags found

No related merge requests found

Changes 3

Show whitespace changes

Inline Side-by-side

Showing

source/blender/blenkernel/BKE_icons.h 4 additions, 4 deletions

source/blender/blenkernel/BKE_icons.h
source/blender/blenkernel/intern/icons.c 16 additions, 11 deletions

source/blender/blenkernel/intern/icons.c
source/blender/makesrna/intern/rna_brush.c 0 additions, 1 deletion

source/blender/makesrna/intern/rna_brush.c

with 20 additions and 16 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please sign in to comment