Fix: Auto Merge icon state were wrongly swapped
authorWilliam Reynish <billrey@me.com>
Wed, 22 May 2019 12:21:31 +0000 (14:21 +0200)
committerWilliam Reynish <billrey@me.com>
Wed, 22 May 2019 12:21:31 +0000 (14:21 +0200)
commit12c9a9131fd9a6ea8ae060a6914b33a3c7ac5468
tree460e160960126500430dab3973f6705a91544313
parentf05b9dba26607c319fa2246ec915490f10ca86e6
Fix: Auto Merge icon state were wrongly swapped
release/datafiles/blender_icons16/icon16_automerge_off.dat
release/datafiles/blender_icons16/icon16_automerge_on.dat
release/datafiles/blender_icons32/icon32_automerge_off.dat
release/datafiles/blender_icons32/icon32_automerge_on.dat
source/blender/editors/include/UI_icons.h
source/blender/makesrna/intern/rna_scene.c