aw/valentina
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,847 Commits 3 Branches 35 Tags 270 MiB
d8c5fafbc3
Commit Graph

459 Commits

Author SHA1 Message Date
Roman Telezhynskyi
8b1e9e24d4 Tool path and piece now bring formulas, should cover this fact. 
--HG--
branch : feature
 2017-01-21 17:32:08 +02:00
Roman Telezhynskyi
669d295804 Class VToolDetail removed. 
--HG--
branch : feature
 2017-01-21 16:30:14 +02:00
Roman Telezhynskyi
0ef10c01b0 A piece seam allowance can be controlled by formula. 
--HG--
branch : feature
 2017-01-21 15:24:40 +02:00
Roman Telezhynskyi
121f003e7c Refactoring. Move grainline and lable to library VWidgets. 
--HG--
branch : feature
 2017-01-19 12:23:42 +02:00
Roman Telezhynskyi
84b285cbe4 Refactoring. Grainline and label have common parent. 
--HG--
branch : feature
 2017-01-19 12:07:26 +02:00
Roman Telezhynskyi
004c83a11f After each reset label or grainline need to repaint piece image. 
--HG--
branch : feature
 2017-01-18 14:01:51 +02:00
Roman Telezhynskyi
ccc8da800f Pieces should disappear from the list when deleted. 
--HG--
branch : feature
 2017-01-18 12:22:02 +02:00
Roman Telezhynskyi
d2ff75dedc Tool Union Details now works. 
--HG--
branch : feature
 2017-01-18 10:17:18 +02:00
Roman Telezhynskyi
8eba46ade1 The tool redesign was finnised. Code is not tested. 
--HG--
branch : feature
 2017-01-16 17:37:15 +02:00
Roman Telezhynskyi
6faa0bc318 First successful build. The redesign is not finished. 
--HG--
branch : feature
 2017-01-16 12:08:13 +02:00
Roman Telezhynskyi
60810c4d04 Use parent implementation for methods incrementReferens() and 
decrementReferens() where possible.

--HG--
branch : feature
 2017-01-16 12:06:50 +02:00
Roman Telezhynskyi
af51e5e240 Seam allowance tool already initializated and can't init the path. 
--HG--
branch : feature
 2017-01-13 19:07:14 +02:00
Roman Telezhynskyi
548f7844f4 Missed to replace VDetail by VPiece. 
--HG--
branch : feature
 2017-01-13 15:19:27 +02:00
Roman Telezhynskyi
f51d32d88e Move static methods to private section. 
--HG--
branch : feature
 2017-01-13 10:24:48 +02:00
Roman Telezhynskyi
29490b9e66 Removed dialog Detail. 
--HG--
branch : feature
 2017-01-12 19:17:13 +02:00
Roman Telezhynskyi
c9cb6adc36 VToolSeamAllowance add grain line and labels. Only the tool. 
--HG--
branch : feature
 2017-01-12 15:51:08 +02:00
Roman Telezhynskyi
5a95ce9c8a Merge with develop. 
--HG--
branch : feature
 2017-01-11 14:05:06 +02:00
Roman Telezhynskyi
fe8179d1bf Do not update labels and grain line if disabled. 
--HG--
branch : develop
 2017-01-05 13:13:44 +02:00
Roman Telezhynskyi
1882833ce7 Fixed issue #607. Cut tools do not support operation tools. 
--HG--
branch : develop
 2017-01-04 13:38:10 +02:00
Roman Telezhynskyi
0419f60e0b Merge with develop. 
--HG--
branch : feature
 2016-12-23 12:58:17 +02:00
Roman Telezhynskyi
3a8fd53dc8 Fix memory leak. 
--HG--
branch : develop
 2016-12-21 21:39:44 +02:00
Roman Telezhynskyi
a6a8ef29b0 Refactoring. Merge similar switch cases together. 
--HG--
branch : develop
 2016-12-21 21:35:07 +02:00
Roman Telezhynskyi
731eb9ec89 Refactoring. 
There is no automatic disconnection when the 'receiver' is destroyed because
it's a functor with no QObject. However, since 5.2 there is an overload which
adds a "context object". When that object is destroyed, the connection is
broken (the context is also used for the thread affinity: the lambda will be
called in the thread of the event loop of the object used as context).

--HG--
branch : develop
 2016-12-21 20:45:14 +02:00
Roman Telezhynskyi
e4c90a0809 Fix warning "Explicitly capture the required scope variables". 
--HG--
branch : develop
 2016-12-21 20:08:02 +02:00
Roman Telezhynskyi
5c40a91335 Remove empty statement. 
--HG--
branch : develop
 2016-12-21 17:36:38 +02:00
Roman Telezhynskyi
ffc1bae39c Remove redundant declaration. 
--HG--
branch : develop
 2016-12-21 15:22:44 +02:00
Roman Telezhynskyi
2d61b87256 Remove empty statement. 
--HG--
branch : develop
 2016-12-20 21:19:21 +02:00
Roman Telezhynskyi
ffab000e0f Remove empty statement. 
--HG--
branch : develop
 2016-12-20 20:57:20 +02:00
Roman Telezhynskyi
b6d0aa1a1f Tool seam allowance add support for elliptical arc. 
--HG--
branch : feature
 2016-12-20 17:50:39 +02:00
Roman Telezhynskyi
0882313f1e Merge with develop. 
--HG--
branch : feature
 2016-12-20 17:42:51 +02:00
Roman Telezhynskyi
2f46634eff Elliptical arc is an independent scene object. 
--HG--
branch : develop
 2016-12-20 17:05:34 +02:00
Roman Telezhynskyi
f613a3a28f Refactoring. Use QScopedPointer class. 
--HG--
branch : develop
 2016-12-20 16:58:00 +02:00
Roman Telezhynskyi
1fb0ab4d75 Added VNodeEllipticalArc. 
--HG--
branch : develop
 2016-12-20 16:51:58 +02:00
Roman Telezhynskyi
81eb33fe63 Merge with develop. 
--HG--
branch : feature
 2016-12-20 14:39:05 +02:00
Roman Telezhynskyi
f0b35ddc11 Added support elliptical arc in other tools. 
--HG--
branch : develop
 2016-12-20 13:04:56 +02:00
Valentina Zhuravska
00ab0a225e Added VToolEllipticalArc. 
--HG--
branch : feature
 2016-12-17 03:01:40 +02:00
Roman Telezhynskyi
067fd97ae3 Merge with develop. 
--HG--
branch : feature
 2016-12-15 11:42:20 +02:00
Roman Telezhynskyi
d45a04feb0 Correct label size according to parent's bounding rect. 
--HG--
branch : feature
 2016-12-15 09:33:01 +02:00
Roman Telezhynskyi
b16ee3a4d1 Minore changes for VTextGraphicsItem. 
Clearing code. Changed size for control objects.

--HG--
branch : feature
 2016-12-15 08:54:52 +02:00
Roman Telezhynskyi
a3f7b9f60f Fix drawing artifacts. 
--HG--
branch : feature
 2016-12-15 08:52:23 +02:00
Roman Telezhynskyi
97d76957e3 Use font's height. 
--HG--
branch : feature
 2016-12-15 08:46:45 +02:00
Roman Telezhynskyi
4eb9b2da83 Cleaning code. 
--HG--
branch : feature
 2016-12-14 11:59:21 +02:00
BojanKverh
f6122ea8be Fixed font size calculation, so that the app does not get stuck 
--HG--
branch : feature
 2016-12-14 00:56:30 +01:00
Roman Telezhynskyi
ffa241ea0d Removed brush for main path. 
--HG--
branch : feature
 2016-12-03 18:51:36 +02:00
Roman Telezhynskyi
641a807f24 Fix VToolPiecePath visualization. 
--HG--
branch : feature
 2016-12-03 18:44:24 +02:00
Roman Telezhynskyi
35f54c5cc7 Added Internal path. 
--HG--
branch : feature
 2016-12-03 18:01:39 +02:00
BojanKverh
21445db240 Fixed the hangup bug because of very long label words 
--HG--
branch : feature
 2016-12-02 00:44:28 +01:00
Roman Telezhynskyi
939644692d Convert all mx and my values to local seam allowance. 
--HG--
branch : feature
 2016-12-01 20:47:15 +02:00
Roman Telezhynskyi
b3f3f03cc3 Added custom increment and decrement methods for tool VToolPiecePath. 
--HG--
branch : feature
 2016-11-29 14:58:00 +02:00
Roman Telezhynskyi
14962270f6 Refactoring. 
--HG--
branch : feature
 2016-11-29 14:51:46 +02:00
Roman Telezhynskyi
83632bf284 Fix two bugs with VPiecePath. 
--HG--
branch : feature
 2016-11-29 14:11:36 +02:00
Roman Telezhynskyi
5156e0cf25 Read/write piece path include type. 
--HG--
branch : feature
 2016-11-28 14:52:31 +02:00
Roman Telezhynskyi
f56ea24810 Custom Path will work in two modes. The first extend automatic seam allowance, 
the second show custom deam allowance. In this case a path must have options
for controling seam allowance.

--HG--
branch : feature
 2016-11-28 11:58:44 +02:00
Roman Telezhynskyi
fea2ec52fe New section "Custom seam allowance". 
--HG--
branch : feature
 2016-11-28 10:47:36 +02:00
Roman Telezhynskyi
109e23e40d Refactor VToolSeamAllowance::InitTool. Enough to pass only tool id. 
--HG--
branch : feature
 2016-11-25 16:41:52 +02:00
Roman Telezhynskyi
20f8da230d Increment custom seam allowance in tool seam allowance. 
--HG--
branch : feature
 2016-11-25 16:37:32 +02:00
Roman Telezhynskyi
6424a92559 Read/write custom seam allowance record. 
--HG--
branch : feature
 2016-11-25 14:19:44 +02:00
Roman Telezhynskyi
39b27e4b24 New class VToolPiecePath. 
--HG--
branch : feature
 2016-11-24 21:35:54 +02:00
Roman Telezhynskyi
0e78efc714 Move tag strings from VToolSeamAllowance class to VAbstractPattern class. The 
same strings use also VToolPiecePath class.

--HG--
branch : feature
 2016-11-24 21:35:07 +02:00
Roman Telezhynskyi
965e588a9d New piece attribute "united". 
--HG--
branch : feature
 2016-11-23 18:40:27 +02:00
Roman Telezhynskyi
5d5e677e2c Added class VPiecePath. 
--HG--
branch : feature
 2016-11-23 12:54:46 +02:00
Roman Telezhynskyi
c21aedc541 A seam allowance node angle. Read, write and set in the dialog. Not handled in 
seam allowance itself.

--HG--
branch : feature
 2016-11-19 13:44:12 +02:00
Roman Telezhynskyi
585bfec12f Fix bug Tool seam allowance. The tool returned to previous position after 
selecting Apply or Ok buttons in the tool's dialog.

--HG--
branch : feature
 2016-11-12 15:41:15 +02:00
Roman Telezhynskyi
d0b0f55d19 Read and write local seam allowance width (before and after). 
--HG--
branch : feature
 2016-11-12 13:18:16 +02:00
Roman Telezhynskyi
f992bb7bbd Returned visualization of base seam allowance. 
--HG--
branch : feature
 2016-11-10 14:06:09 +02:00
Roman Telezhynskyi
a5fc19d7ec Returned storing and reading base seam allowance values: width and 
enable/disable.

--HG--
branch : feature
 2016-11-10 12:53:02 +02:00
Roman Telezhynskyi
df20415e9e Returned "Forbid flipping" feature. 
--HG--
branch : feature
 2016-11-10 11:56:40 +02:00
Roman Telezhynskyi
1c0dced61d Apply button now works. 
--HG--
branch : feature
 2016-11-09 16:27:55 +02:00
Roman Telezhynskyi
39d2ea41ac Returned undocommand "Toggle piece in layout". 
--HG--
branch : feature
 2016-11-09 15:53:22 +02:00
Roman Telezhynskyi
988ce8f7f2 Returned undocommand "Save piece options". 
--HG--
branch : feature
 2016-11-09 14:11:58 +02:00
Roman Telezhynskyi
8601b2ae2a Returned undocommand "Move piece". 
--HG--
branch : feature
 2016-11-09 13:06:05 +02:00
Roman Telezhynskyi
b88663dcb4 Returned undocommand "Delete piece". 
--HG--
branch : feature
 2016-11-09 11:57:39 +02:00
Roman Telezhynskyi
f593d4ca5b Dialog seam allowance tool should show visualization only when user is creating 
new piece.

--HG--
branch : feature
 2016-11-08 19:11:47 +02:00
Roman Telezhynskyi
11e9b40cb1 Forgot to return a pointer. 
--HG--
branch : feature
 2016-11-08 17:52:56 +02:00
Roman Telezhynskyi
b5061038ba Fix mistake. The next pattern format will be 0.4.0. 
--HG--
branch : feature
 2016-11-08 16:34:44 +02:00
Roman Telezhynskyi
4a41840ae7 New class VToolSeamAllowance. 
--HG--
branch : feature
 2016-11-08 12:57:01 +02:00
Roman Telezhynskyi
a50df3a33c GCC warnings. 
--HG--
branch : develop
 2016-11-03 15:09:48 +02:00
Roman Telezhynskyi
d134e8b367 Clang warnings. 
--HG--
branch : develop
 2016-11-01 10:42:32 +02:00
BojanKverh
96cfc52202 At least one arrow has to be present on a grainline 
--HG--
branch : feature
 2016-10-25 23:00:42 +02:00
BojanKverh
21cd56463c User can now turn on/off grainline arrows 
--HG--
branch : feature
 2016-10-25 00:53:01 +02:00
Roman Telezhynskyi
1aa896eff1 Merged in BojanKverh/valentina-issue331/feature (pull request #147) 
Grainline implementation. ref #331.

--HG--
branch : develop
 2016-10-23 20:05:50 +00:00
BojanKverh
e82f65fc6a Fixed the grainline tab icon in details dialog 
--HG--
branch : feature
 2016-10-23 20:59:38 +02:00
Roman Telezhynskyi
7d935add5b Fix building. Error about private members. 
--HG--
branch : develop
 2016-10-23 19:45:45 +03:00
Roman Telezhynskyi
c203986111 Fix support Qt 5.0. 
--HG--
branch : develop
 2016-10-23 19:38:34 +03:00
Bojan Kverh
01c068ddd0 Merged develop into feature 
--HG--
branch : feature
 2016-10-23 15:28:40 +02:00
Ronan Le Tiec
f91b3dc955 10 new colors added for the lines #577 
--HG--
branch : feature
 2016-10-16 19:23:40 +02:00
BojanKverh
8ab094c40d Grainline should now be visible in Layout mode 
--HG--
branch : feature
 2016-10-16 15:00:53 +02:00
Bojan Kverh
e1a4eeb4e4 Merged develop into feature 
--HG--
branch : feature
 2016-10-15 11:50:17 +02:00
Roman Telezhynskyi
972c70e608 Selected detail is also selected in the list. 
--HG--
branch : develop
 2016-10-14 21:33:12 +03:00
Roman Telezhynskyi
d38e81cecb Added new option "In layout" to context menu tool Detail. 
--HG--
branch : develop
 2016-10-14 20:41:37 +03:00
BojanKverh
e192ff54ec Finished interactive rotation of the grainline and fixed cursor in the Grainline tab of detail dialog 
--HG--
branch : feature
 2016-10-13 23:33:32 +02:00
Bojan Kverh
39afb81321 Merged develop into feature 
--HG--
branch : feature
 2016-10-13 19:53:49 +02:00
Roman Telezhynskyi
0817264a84 New feature. Valentina will highlight a detail selected in the Group list. 
--HG--
branch : develop
 2016-10-12 14:43:08 +03:00
BojanKverh
fce2849208 Worked on grainline rotation 
--HG--
branch : feature
 2016-10-12 02:45:01 +02:00
BojanKverh
dc36337663 Implemented interactive resizing for grainline item 
--HG--
branch : feature
 2016-10-11 00:27:14 +02:00
Bojan Kverh
520995a90c Merged develop into feature 
--HG--
branch : feature
 2016-10-06 20:39:55 +02:00
Roman Telezhynskyi
593bae3969 Fixed build on Windows. 
--HG--
branch : develop
 2016-10-06 19:12:25 +03:00
BojanKverh
b755762aec Merged develop into feature 
--HG--
branch : feature
 2016-10-05 20:27:57 +02:00
Roman Telezhynskyi
4a50f2e3c9 Fixed wrong include. 
--HG--
branch : develop
 2016-10-04 17:52:03 +03:00
Roman Telezhynskyi
abce5439a5 Resolved issue #573. New tool: 'Move Point'. 
--HG--
branch : develop
 2016-10-04 17:34:37 +03:00
Roman Telezhynskyi
1eb93fd4f7 Fixed wrong selecting rule for the tool Line. 
--HG--
branch : develop
 2016-10-04 13:52:04 +03:00
BojanKverh
60462bc303 Fixed some code style and replaced some code with more appropriate one according to general recommendations 
--HG--
branch : feature
 2016-09-29 02:13:18 +02:00
BojanKverh
083b2035af Hopefully this commit solves the #551 issue 
--HG--
branch : feature
 2016-09-29 01:39:50 +02:00
BojanKverh
744acbcd3b Merged with develop 
--HG--
branch : feature
 2016-09-27 22:00:02 +02:00
Roman Telezhynskyi
fd8ab6123c Fixed issue #565. Bug : Some informations not saved in "Seam allowance tool" in 
Draw Mode.

--HG--
branch : develop
 2016-09-24 22:30:33 +03:00
Roman Telezhynskyi
3bb657ea1a New internal variable "Length to spline control point". 
--HG--
branch : develop
 2016-09-24 20:44:06 +03:00
Roman Telezhynskyi
eee2144483 Fix crash. Each tool should delete visualization even if scene also can delete 
it.

--HG--
branch : develop
 2016-09-24 16:09:09 +03:00
BojanKverh
5f1d7a357a Merged develop into feature, removing the conflicts 
--HG--
branch : feature
 2016-09-20 19:29:49 +02:00
Roman Telezhynskyi
74bc4179ef New tool Flipping by axis. 
--HG--
branch : feature
 2016-09-17 12:10:03 +03:00
Roman Telezhynskyi
91c614a2b8 Fix broken build. 
--HG--
branch : feature
 2016-09-16 11:03:51 +03:00
BojanKverh
de799569ef Fixed moving and scaling grainline and ensured that it stays in bounds 
--HG--
branch : feature
 2016-09-14 01:15:01 +02:00
Roman Telezhynskyi
bfde34c882 Rename RotationMoveLabel class. 
--HG--
branch : feature
 2016-09-13 11:47:33 +03:00
Roman Telezhynskyi
9bb88afaa5 New tool Flipping by line. 
--HG--
branch : feature
 2016-09-13 11:27:44 +03:00
BojanKverh
8e0dc15e25 Moving the grainline works now, but still has a few issues 
--HG--
branch : feature
 2016-09-11 12:18:09 +02:00
BojanKverh
f341f51125 Grainline is visible on the detail now, rotation and length can be edited, but it cannot be moved yet 
--HG--
branch : feature
 2016-09-10 18:30:03 +02:00
BojanKverh
287f8fc41e Added VGrainlineGeometry class to hold grainline parameters and methods to save, load and edit it 
--HG--
branch : feature
 2016-09-06 23:50:46 +02:00
Roman Telezhynskyi
0d35033275 Added global option "Forbid Flipping". ref #560. 
--HG--
branch : develop
 2016-09-06 17:05:54 +03:00
Roman Telezhynskyi
038863fbdf Resolved issue #560. Flipped pattern pieces in Layout. 
--HG--
branch : develop
 2016-09-06 13:24:52 +03:00
Roman Telezhynskyi
7dd88da82d Merged in BojanKverh/valentina-issue24a/feature (pull request #138) 
Improvements for feature "New feature: Label on detail" ref #24.

--HG--
branch : develop
 2016-08-22 11:33:22 +03:00
Roman Telezhynskyi
bfff8ccb96 Changes for returning support Qt 5.0 and GCC 4.6. 
--HG--
branch : develop
 2016-08-21 18:57:08 +03:00
Bojan Kverh
08bfd9cd82 Merged develop into feature 
--HG--
branch : feature
 2016-08-21 11:51:49 +02:00
BojanKverh
b4ced822e0 Fixed material attribute writing to XML and removed commented out lines 
--HG--
branch : feature
 2016-08-21 11:48:51 +02:00
Roman Telezhynskyi
0563df117d <QLoggingCategory> available since Qt 5.2. Use vmisc/logging.h instead. 
--HG--
branch : develop
 2016-08-21 11:54:32 +03:00
Bojan Kverh
19c69c691a Merged develop into feature 
--HG--
branch : feature
 2016-08-21 00:01:35 +02:00
Roman Telezhynskyi
948ae32dc5 Fixed regression with tool "Union details". 
One file in collection contain unpredicted case. For fixing returned old code.

--HG--
branch : develop
 2016-08-20 17:34:49 +03:00
BojanKverh
1cfa97497c Fixed translations after language change 
--HG--
branch : feature
 2016-08-17 21:38:39 +02:00
Bojan Kverh
10f2d83edd Merged develop into feature 
--HG--
branch : feature
 2016-08-17 18:00:56 +02:00
Roman Telezhynskyi
e333c9bc08 QtDebug and QDebug lead to the same header. Leave only QtDebug. 
--HG--
branch : develop
 2016-08-16 20:35:21 +03:00
Roman Telezhynskyi
d66280033b Fixed issue #546. Compile error under Windows in current develop revision. 
--HG--
branch : develop
 2016-08-16 19:57:32 +03:00
Roman Telezhynskyi
3ef57202d1 Resolved issue #544. Error: Color Lines are black until touched. 
(grafted from f62bbdf4122fa02aa12d110d123b900b94c423d1)

--HG--
branch : develop
 2016-08-16 18:23:20 +03:00
BojanKverh
92ec78e6b3 Made sure that labels stay inside the detail after changing size or height 
--HG--
branch : feature
 2016-08-15 17:19:21 +02:00
BojanKverh
fb326d4f39 Added %size% and %height% placeholders to display pattern size and height in the Pattern size line edit 
--HG--
branch : feature
 2016-08-15 13:03:59 +02:00
BojanKverh
b0532e6fb9 Removed userDef attributes from DOM tree, where they are not necessary. Fixed some translations. Refactored finding the selected material in detail dialog 
--HG--
branch : feature
 2016-08-11 22:44:53 +02:00
Roman Telezhynskyi
0aabacfee4 String inside label also should be translated. 
--HG--
branch : develop
 2016-08-09 19:42:00 +03:00
Roman Telezhynskyi
7585db6a58 Fix build on Qt\5.3\msvc2013_64_opengl. 
--HG--
branch : develop
 2016-08-09 16:55:46 +03:00
Roman Telezhynskyi
9035382238 Cppcheck warnings. 
--HG--
branch : develop
 2016-08-09 14:18:49 +03:00
Roman Telezhynskyi
67360605b3 Fix broken tool Union details. 
--HG--
branch : develop
 2016-08-08 17:34:50 +03:00
Roman Telezhynskyi
80f00b361d Use "Include What You Use" tool for optimizing #includes. 
--HG--
branch : develop
 2016-08-08 14:44:49 +03:00
Roman Telezhynskyi
da91ed974a Merged in BojanKverh/valentina-issue24/feature (pull request #134) 
Fixed issue #24. New feature: Label on detail.

--HG--
branch : develop
 2016-08-07 18:08:39 +03:00
Roman Telezhynskyi
c9cdd2cd8d Using macros QT_WARNING_DISABLE_*. 
--HG--
branch : develop
 2016-08-06 21:42:40 +03:00
BojanKverh
f56614966b Deleted unnecessary class member 
--HG--
branch : feature
 2016-08-03 00:44:22 +02:00
BojanKverh
192bd7e7d5 Deleted unnecessary include 
--HG--
branch : feature
 2016-08-03 00:39:02 +02:00
BojanKverh
a2ee1e24e6 Fixed cursor handling over the label 
--HG--
branch : feature
 2016-08-03 00:32:37 +02:00
BojanKverh
f2d5b00fd9 Detail bounding box is drawn when one of its items is in move, resize or rotate mode 
--HG--
branch : feature
 2016-08-02 22:51:40 +02:00
Roman Telezhynskyi
a2d18c15a4 Fix broken VTextGraphicsItem::paint. 
--HG--
branch : develop
 2016-08-02 21:16:15 +03:00
Roman Telezhynskyi
ffb6f1fbd5 cppcheck warnings. 
--HG--
branch : develop
 2016-08-02 15:12:13 +03:00
BojanKverh
a1c905381b Fixed label update on clicking OK in pattern properties dialog and the label is hidden when there is no text on it 
--HG--
branch : feature
 2016-07-30 13:21:03 +02:00
Bojan Kverh
c5f38207fd Merged develop into feature 
--HG--
branch : feature
 2016-07-29 21:47:49 +02:00
Roman Telezhynskyi
75e9e9b2ee Fixed issues with include paths. 
--HG--
branch : develop
 2016-08-05 13:41:02 +03:00
Valentina Zhuravska
1ae8509d63 Merge with develop. 
--HG--
branch : feature
 2016-07-26 15:32:55 +03:00