mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-11 09:40:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master'

Browse Source
This commit is contained in:
David Capello 2016-04-25 14:05:48 -03:00
commit f87cf93a55
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/CMakeLists.txt
View File

@ -25,14 +25,6 @@ if(MSVC)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /NODEFAULTLIB:LIBCMT")
endif()
if (CMAKE_CL_64)
# 64 bits
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MACHINE:X64")
else()
# Add support for Windows XP with 5.01 subsystem
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MACHINE:X86 /SUBSYSTEM:WINDOWS,5.01")
endif()
add_definitions(-D_SCL_SECURE_NO_WARNINGS)
endif(MSVC)

16
src/app/ui/brush_popup.cpp
View File

@ -18,6 +18,7 @@
#include "app/modules/gui.h"
#include "app/modules/palettes.h"
#include "app/pref/preferences.h"
#include "app/tools/tool.h"
#include "app/ui/app_menuitem.h"
#include "app/ui/button_set.h"
#include "app/ui/context_bar.h"
@ -94,8 +95,19 @@ private:
if (m_slot >= 0)
contextBar->setActiveBrushBySlot(m_slot);
else if (m_brush.hasBrush())
contextBar->setActiveBrush(m_brush.brush());
else if (m_brush.hasBrush()) {
tools::Tool* tool = App::instance()->activeTool();
auto& brushPref = Preferences::instance().tool(tool).brush;
BrushRef brush;
brush.reset(
new Brush(
static_cast<doc::BrushType>(m_brush.brush()->type()),
brushPref.size(),
brushPref.angle()));
contextBar->setActiveBrush(brush);
}
}
AppBrushes& m_brushes;