Tom Robinson [Thu, 24 Mar 2016 15:49:19 +0000 (15:49 +0000)]
DALi Version 1.1.27
Change-Id: I4a66b67ae99249a4edc7851674336a3ba60f2b88
Xiangyin Ma [Tue, 23 Feb 2016 16:58:07 +0000 (16:58 +0000)]
Render SVG with ImageView
Change-Id: I70f0ffcb30d9d353940eed5c22c631be79122d55
Paul Wisbey [Mon, 21 Mar 2016 17:29:44 +0000 (17:29 +0000)]
PropertyBuffer SetData clean-up
Change-Id: Ia4783fd5c18ccc97e81c239eadf00663d625d962
Richard Huang [Fri, 18 Mar 2016 13:10:13 +0000 (13:10 +0000)]
DALi Version 1.1.26
Change-Id: I9906d8f0c1cf1ce48e5f2aae6260e30bd076acd3
suhyung Eom [Wed, 16 Mar 2016 02:04:59 +0000 (19:04 -0700)]
Merge "Add TiltSensor demo" into devel/master
Nick Holland [Fri, 11 Mar 2016 15:02:46 +0000 (15:02 +0000)]
DALi Version 1.1.25
Change-Id: I2ed2d9500bd60f3bb521ccba593ba2ca0cb144af
Ferran Sole [Thu, 18 Feb 2016 17:26:19 +0000 (17:26 +0000)]
Changes following deprecation of position inheritance modes
Change-Id: Ia04c81329062610182df63da05b58def4c3d927f
Tom Robinson [Tue, 8 Mar 2016 18:43:43 +0000 (18:43 +0000)]
Fixed dali-demo bubbles non-linear movement and stopping
Change-Id: I6788eb41a29a81f9a2f3fb1722d9ef5e416075b8
suhyung Eom [Tue, 8 Mar 2016 08:39:09 +0000 (17:39 +0900)]
Add TiltSensor demo
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I9e367f4140f18566526ea917da8e571403bd046c
Ferran Sole [Mon, 7 Mar 2016 09:07:57 +0000 (09:07 +0000)]
DALi Version 1.1.24
Change-Id: I968b8cb3ef02054373ff544804bd7c5735c54073
Tom Robinson [Tue, 1 Mar 2016 14:50:47 +0000 (14:50 +0000)]
Dali-demo install script and README for Emscripten examples
Change-Id: I15c5a25925ed9c8fdd60f8b0fa322fbeaf02c94a
Kimmo Hoikka [Tue, 1 Mar 2016 13:48:30 +0000 (05:48 -0800)]
Merge "Added Javascript docs live demo example" into devel/master
David Steele [Fri, 26 Feb 2016 14:01:45 +0000 (06:01 -0800)]
Merge "DALi Version 1.1.23" into devel/master
David Steele [Fri, 26 Feb 2016 13:45:40 +0000 (13:45 +0000)]
DALi Version 1.1.23
Change-Id: I120c6f2c6c616129f5f68b6afdce13138031f0c1
dongsug.song [Tue, 16 Feb 2016 10:08:05 +0000 (19:08 +0900)]
change manifest xml file to fix permission denied error when launching sample app
Change-Id: Icdf807f5d57f533712575daad708ab921151e386
Lee Morgan [Wed, 24 Feb 2016 14:48:28 +0000 (14:48 +0000)]
Added Javascript docs live demo example
Change-Id: Ifca2f2f905ba81cdf725737907790586a12a5452
Tom Robinson [Thu, 25 Feb 2016 17:03:03 +0000 (17:03 +0000)]
Build: Only copy dali-toy on Desktop build
Change-Id: I85adbc37a0474ae79918e289ddf2a6e39f7d24a6
Tom Robinson [Fri, 19 Feb 2016 17:30:49 +0000 (17:30 +0000)]
Dali-Toy Javascript demo
Change-Id: I6a663c46a6592bbb3aaa24f3a12ff5937664b262
Adeel Kazmi [Fri, 19 Feb 2016 11:16:56 +0000 (03:16 -0800)]
Merge "DALi Version 1.1.22" into devel/master
Agnelo Vaz [Fri, 19 Feb 2016 10:52:36 +0000 (10:52 +0000)]
DALi Version 1.1.22
Change-Id: I47a1123083a73f1a08bf435c38fc94a27776b582
Adeel Kazmi [Thu, 18 Feb 2016 13:12:07 +0000 (13:12 +0000)]
Updates following rendererType changes
Change-Id: I980d7723528705caa2d903c9b36c24c4b744a55e
Xiangyin Ma [Thu, 11 Feb 2016 16:37:14 +0000 (16:37 +0000)]
Ensure the use of ShaderEffect in ImageActor is backwards-compatible
Change-Id: I699f227e72c4b3ce906a17fdb3dc940331c9ec4a
Adeel Kazmi [Fri, 12 Feb 2016 10:32:37 +0000 (10:32 +0000)]
DALi Version 1.1.21
Change-Id: I1ed026ec74a77180df3725ec0e930d9cdfb3d84c
Xiangyin Ma [Mon, 1 Feb 2016 13:47:34 +0000 (13:47 +0000)]
Update following the changes of Blending&Culling options
Change-Id: I390f4bd7cca141658c3a300ae742145fddf37e07
Xiangyin Ma [Fri, 5 Feb 2016 08:53:19 +0000 (08:53 +0000)]
DALi Version 1.1.20
Change-Id: Iff4015eb3bf56293fd0b098559045344eed81777
Adam Bialogonski [Tue, 26 Jan 2016 15:17:47 +0000 (15:17 +0000)]
New more realistic benchmark creating paged list of icons and performs scroll across pages.
- images have been converted, so they don't crash on the device
- when benchmark uses tableview, no manual sizing is enabled
- font size has been calculated using dpi to work with various screens
- added extra-help text describing benchmark options
Change-Id: Ia2ed1b9019b9b436903f470055ac1eac3be7eb68
Tom Robinson [Fri, 29 Jan 2016 11:33:49 +0000 (11:33 +0000)]
DALi Version 1.1.19
Change-Id: I26839a48cea234d318321338518c84be72a5b89f
Richard Huang [Fri, 22 Jan 2016 13:29:10 +0000 (13:29 +0000)]
DALi Version 1.1.18
Change-Id: I27e43b510d86704a2b3b69e4d14a3cc5ea5e0318
David Steele [Thu, 14 Jan 2016 16:12:33 +0000 (16:12 +0000)]
Changed DALI_*_DIR to DEMO_*_DIR
Scripts, examples and demo code should not use defines from other
parts of DALi. DALI_IMAGE_DIR is defined in Dali toolkit to specify
where the toolkit images are. This is used in the default toolkit
style file to specify the locations of the toolkit images.
It must not be overridden by applications.
Updated the demo style file to utilize a configured variable to point
at the installed demo style's images.
Added an example of a demo-specific image (confirmation popup background)
Updated dali-builder to load the demo theme (Scripting example within demo
already loads it)
Change-Id: Ie43a6611a8db3fc0afc6a1cd4d9d6e48afef75e7
Signed-off-by: David Steele <david.steele@samsung.com>
Xiangyin Ma [Wed, 13 Jan 2016 14:43:58 +0000 (14:43 +0000)]
Example of using pre-multiplied alpha in ImageView
Change-Id: Icae141ade364286a2bbc7e26ce2db81c583c224e
Kimmo Hoikka [Wed, 20 Jan 2016 14:59:27 +0000 (06:59 -0800)]
Merge "Example of setting PixelArea in ImageView" into devel/master
Xiangyin Ma [Tue, 12 Jan 2016 15:31:50 +0000 (15:31 +0000)]
Example of setting PixelArea in ImageView
Change-Id: I488842dcec638e1d290142b143a11e82945eb3c3
Yoonsang Lee [Tue, 29 Dec 2015 23:12:27 +0000 (08:12 +0900)]
Seperate dali-adaptor & dali-adaptor-uv packages
- Now dali-demo (and other native dali appplication packages) refers dali-adaptor
because native dali apps could not use libuv backend at the moment.
- Before this patch, dali-demo only checked dali-adaptor package (which was
confusingly named to 'dali') and dali-toolkit package.
- In this patch, dali-demo checks dali-core, dali-adaptor, and
dali-toolkit packages to make it clearer.
Change-Id: Ia9f3f81a35f8df4fdd228d4cf476b9008a287483
Nick Holland [Fri, 15 Jan 2016 14:40:56 +0000 (14:40 +0000)]
DALi Version 1.1.17
Change-Id: Ia0dc10603a77ebcc17b6a48c8bb53f85f004aabf
Tom Robinson [Mon, 11 Jan 2016 17:11:42 +0000 (17:11 +0000)]
Added ASTC Native file format loader
ASTC can be wrapped in a KTX file, but also has its own native file format.
This patch provides support for the native ASTC file format (.astc).
Textures can be generated using tools (Eg. Mali texture compression tool).
Note: ASTC is "OpenGL friendly" in that the textures are pre-flipped vertically.
In DALi there is currently not a differenciation between different texture compression formats in that the data (once the header is extracted) is given to the hardware as-is.
For this reason textures must currently be pre-flipped vertically (before compression) when using the native .astc file format with DALI.
An example .astc file is included as part of the unit tests.
Change-Id: I8604fba28bfb83b0deff8689fd5d7cfb8ac770bb
Tom Robinson [Tue, 15 Dec 2015 11:34:47 +0000 (11:34 +0000)]
Support for ASTC compressed textures wrapped in KTX files
ASTC is supported by OpenGL ES 3.1 and above.
To build this patch with ASTC support, a GLES 31 context must be specified.
To build for desktop with configure, the gles version must be set to 31.
Here is an example configure line:
CXXFLAGS="-g -O0 -Wno-unused-local-typedefs" CXX="ccache g++" ./configure --prefix=$DESKTOP_PREFIX --enable-debug=yes --enable-profile=UBUNTU --enable-gles=31
With GBS, add the following to your gbs build line:
--define "%target_gles_version 31"
Change-Id: I4f54f894dd4b8998f16aa98d3d0a06606f0eb7a2
Lee Morgan [Fri, 8 Jan 2016 14:32:58 +0000 (14:32 +0000)]
DALi Version 1.1.16
Change-Id: I5fa005aead7fac1c3776a8124df52ffd148c5674
Adeel Kazmi [Wed, 6 Jan 2016 14:00:14 +0000 (14:00 +0000)]
Removed unused enum
Change-Id: Ia8272ab838dea4276efca08c94b3d38489e85699
Adeel Kazmi [Wed, 23 Dec 2015 17:22:00 +0000 (17:22 +0000)]
DALi Version 1.1.15
Change-Id: Icbfb4b565b3d4e203a7ede1ac246826cdb32324b
Ferran Sole [Fri, 4 Dec 2015 13:11:29 +0000 (13:11 +0000)]
Changed benchmark to use ImageView by default
-ImageView is used by default
-ImageActor can still be used if the command line option "--use-image-actor" is specified
-Fixed bug on HideAnimation
Change-Id: Ib9664b7a99a142681bfdbe9ebb3ab457069d6cf7
Xiangyin Ma [Fri, 4 Dec 2015 17:32:23 +0000 (17:32 +0000)]
Added SuperBlur & Bloom demo
Change-Id: I0de724d4efd822db22db18e2b411263a0f56f10c
Adeel Kazmi [Fri, 11 Dec 2015 18:40:29 +0000 (10:40 -0800)]
Merge "Update the ShaderEffect script to resize the geometry" into devel/master
David Steele [Fri, 11 Dec 2015 14:42:05 +0000 (14:42 +0000)]
DALi Version 1.1.14
Change-Id: I757b36ee3797eca40a3be8b67f73c7b23a81ff70
Xiangyin Ma [Wed, 9 Dec 2015 17:52:37 +0000 (17:52 +0000)]
Update the ShaderEffect script to resize the geometry
Change-Id: Ie7298f5bbd6bb3c4dea7aef4930f15345a97b173
Adeel Kazmi [Thu, 10 Dec 2015 17:59:11 +0000 (17:59 +0000)]
Change dali-builder background colour to WHITE
Change-Id: I42df9f8118c56a963c5f37d7a1da61d7cf72f17d
Tom Robinson [Thu, 26 Nov 2015 17:51:17 +0000 (17:51 +0000)]
Implement image fitting modes
Change-Id: Id3088e4f8b6158266b1531a28c1d71b89ac86b95
Adeel Kazmi [Mon, 7 Dec 2015 14:48:59 +0000 (14:48 +0000)]
(Popup) Fix back/ESC key handling & ToastPopup
Change-Id: Ibab6ccde4b3ed1d26e75bacc10f3e96c506b8f2d
Xiangyin Ma [Fri, 4 Dec 2015 11:03:14 +0000 (11:03 +0000)]
DALi Version 1.1.13
Change-Id: Idcd01e1277c1eaae6cb75544c060389c3c22702f
Kimmo Hoikka [Wed, 2 Dec 2015 14:00:26 +0000 (06:00 -0800)]
Merge "Metaballs demos" into devel/master
Adeel Kazmi [Wed, 2 Dec 2015 12:28:24 +0000 (12:28 +0000)]
Added clock script to check animation time
Change-Id: Id65b42e32fdd4b6ed391480f2f40a50071815ea0
David Fumanal [Thu, 26 Nov 2015 17:01:59 +0000 (17:01 +0000)]
Metaballs demos
Change-Id: I76fac1d60cdfb919e1948e9b4e8cafe070aad335
Xiangyin Ma [Mon, 30 Nov 2015 15:06:45 +0000 (15:06 +0000)]
Remove ImageActor from Demo
Change-Id: I597a13e0c249bdbd20b33e57ecc55e16fdfa8c77
Adeel Kazmi [Fri, 27 Nov 2015 13:42:12 +0000 (13:42 +0000)]
(TextLabel Example) Fixed Pan gesture handling
Problem: When we are resizing and go past the minimum size of the container and then release, we have to move
the distance we moved from the minimum size to the our release point again in order to make the
container resize again.
Reason: This was because we kept on changing mLayoutSize but did not reset it when the pan starts.
Solution: Reset mLayoutSize when the pan starts.
Change-Id: I3ded29691e8f1c405847f971d9a89d50aa448fdf
Adeel Kazmi [Fri, 27 Nov 2015 10:17:26 +0000 (10:17 +0000)]
DALi Version 1.1.12
Change-Id: I82f013d5c5c781acca3886a8d157a2a64f2021cb
Richard Huang [Fri, 20 Nov 2015 10:58:23 +0000 (10:58 +0000)]
DALi Version 1.1.11
Change-Id: Ib6b75a5a29448cd7e87cb4ee374fc44146205987
Xiangyin Ma [Wed, 18 Nov 2015 18:51:26 +0000 (18:51 +0000)]
Update the slider script example
Change-Id: I1759e3f574cc35876abc5fdeb75a9d2e4934bd0b
Kimmo Hoikka [Tue, 17 Nov 2015 18:17:28 +0000 (10:17 -0800)]
Merge "Changed dali demo table to use custom shaders for the stencil 9-patch image." into devel/master
Adeel Kazmi [Fri, 13 Nov 2015 16:33:59 +0000 (16:33 +0000)]
DALi Version 1.1.10
Change-Id: Ied10532c95a7aa1c49b87249bc879736721aa10e
Chu Hoang [Fri, 13 Nov 2015 14:04:38 +0000 (14:04 +0000)]
Changed dali demo table to use custom shaders for the stencil 9-patch image.
Updated the item-background-9.png to look nicer.
Change-Id: Ied0c432abac9448dfe6c34bc594358e0334fa7fd
Adeel Kazmi [Wed, 11 Nov 2015 11:00:52 +0000 (11:00 +0000)]
Fix various Klocwork errors
Change-Id: Ieafb91449fe2f4431206c5e3b449f0b26fd10b13
Lee Morgan [Fri, 6 Nov 2015 13:47:35 +0000 (13:47 +0000)]
Always print version with dali-builder
Change-Id: Ib50fdc7505a238115df0b2dd0dbe246022d1acca
Adeel Kazmi [Fri, 6 Nov 2015 11:55:59 +0000 (03:55 -0800)]
Merge "Changed Item View example to no longer use ImageActor or a custom texture atlas." into devel/master
Tom Robinson [Fri, 6 Nov 2015 10:37:10 +0000 (10:37 +0000)]
DALi Version 1.1.9
Change-Id: If57f3813648b47a811fdc62ed94e9142cece567c
Chu Hoang [Mon, 26 Oct 2015 12:01:24 +0000 (12:01 +0000)]
Changed Item View example to no longer use ImageActor or a custom texture atlas.
Change-Id: I819cd9de6ff49c0d86046aa4f2738f87f21c4a16
Adeel Kazmi [Mon, 2 Nov 2015 18:40:44 +0000 (18:40 +0000)]
Changes following the property & singal name changes
Change-Id: I5d09c3ba92dca882a6ae3e1765cb105ddad66bec
Xiangyin Ma [Tue, 27 Oct 2015 15:46:43 +0000 (15:46 +0000)]
Update Atlas demo
Change-Id: Iccdf7248363a76cb264a5559c11dbed4edbf73bd
Ferran Sole [Fri, 30 Oct 2015 11:07:37 +0000 (11:07 +0000)]
Added key event handling to image-view-example
To allow quitting example with escape or back key
Change-Id: Icaa30d4991ee2f65e8c10e4fc136f52de05168cd
Nick Holland [Thu, 29 Oct 2015 10:32:02 +0000 (10:32 +0000)]
DALi Version 1.1.8
Change-Id: Ia37d31f8d4e4b0f1d54a9da109c8e0bd159191a6
Kimmo Hoikka [Tue, 27 Oct 2015 14:29:15 +0000 (07:29 -0700)]
Merge "Adding Image View example demostrating changing, adding and removing ImageViews." into devel/master
Kimmo Hoikka [Tue, 27 Oct 2015 14:25:06 +0000 (07:25 -0700)]
Merge "Changed Cube Transition example to use new CubeTransitionEffect." into devel/master
Chu Hoang [Wed, 21 Oct 2015 09:01:22 +0000 (10:01 +0100)]
Changed Cube Transition example to use new CubeTransitionEffect.
Change-Id: I93d0cede01c9afd0239ba0230cd082ee4acacd25
Chu Hoang [Tue, 25 Aug 2015 10:27:09 +0000 (11:27 +0100)]
Adding Image View example demostrating changing, adding and removing ImageViews.
Change-Id: I4a0238a90a26201086e412369da0170435e1a86b
Chu Hoang [Fri, 23 Oct 2015 14:25:39 +0000 (15:25 +0100)]
Fixed benchmark example comment about flag names.
Change-Id: Id633e6b967f901734d12643f6693ba20759988fc
Adeel Kazmi [Fri, 23 Oct 2015 14:19:27 +0000 (07:19 -0700)]
Merge "DALi Version 1.1.7" into devel/master
Kimmo Hoikka [Fri, 23 Oct 2015 13:05:07 +0000 (06:05 -0700)]
Merge "Changed Shadow example to use ImageView." into devel/master
Lee Morgan [Fri, 23 Oct 2015 10:00:44 +0000 (11:00 +0100)]
DALi Version 1.1.7
Change-Id: I6a31b30255d5a0d53d17ac8d2d75dba1539617b0
Chu Hoang [Fri, 16 Oct 2015 15:08:21 +0000 (16:08 +0100)]
Changed Shadow example to use ImageView.
Change-Id: Id5e73e4214bc1c88d66bf89d5f50da5a7f9be01b
Chu Hoang [Thu, 15 Oct 2015 14:19:20 +0000 (15:19 +0100)]
Removal of more ImageActor usage from examples.
Change-Id: I85a641655c2a1f1691fd53a217ee1600d5a45165
Chu Hoang [Mon, 12 Oct 2015 15:26:24 +0000 (16:26 +0100)]
Removed more ImageActor usage from dali-demo.
Change-Id: If925dd14b7f6091136ec4fdd0c879c53ee43a1ff
Kimmo Hoikka [Wed, 14 Oct 2015 09:36:21 +0000 (02:36 -0700)]
Merge "Changed benchmark example to use image urls directly when creating ImageViews." into devel/master
Chu Hoang [Tue, 13 Oct 2015 13:33:24 +0000 (14:33 +0100)]
Changed benchmark example to use image urls directly when creating ImageViews.
Change-Id: Ie6e970a2df6812d1a0daea4758159c98eebe487d
Ferran Sole [Wed, 7 Oct 2015 09:23:22 +0000 (10:23 +0100)]
Changes following "Remove Sampler scene object"
Change-Id: I5c99b4c1b27d0f3b8fc8102620f5f8e6e90f399b
Kimmo Hoikka [Mon, 12 Oct 2015 12:26:19 +0000 (13:26 +0100)]
Remove some dead code from dali-demo
Change-Id: Ia265405b98d66d6c45fcff7d157a62c45b93b198
Tom Robinson [Fri, 9 Oct 2015 09:48:51 +0000 (10:48 +0100)]
DALi Version 1.1.6
Change-Id: Ia0cd02c19c09302aaf71e311c9630b70f0b0d998
Kimmo Hoikka [Mon, 5 Oct 2015 13:17:50 +0000 (06:17 -0700)]
Merge "Another change to Image Scaling Irregular Grid example to not use deprecated ImageView::GetImage method." into devel/master
Chu Hoang [Wed, 23 Sep 2015 13:40:26 +0000 (14:40 +0100)]
Another change to Image Scaling Irregular Grid example to not use deprecated ImageView::GetImage method.
Change-Id: I9d1ff6792eb7b664c9453f2f25ee5cc180754268
Xiangyin Ma [Fri, 2 Oct 2015 17:46:07 +0000 (18:46 +0100)]
Change the colors in demo laucher
Change-Id: I5dbe51d7bd65a18fc150acadd4d8ffe15b9c5546
Kimmo Hoikka [Mon, 5 Oct 2015 09:47:00 +0000 (02:47 -0700)]
Merge "Added nine patch images to Benchmark example." into devel/master
Chu Hoang [Fri, 2 Oct 2015 14:05:40 +0000 (15:05 +0100)]
Added nine patch images to Benchmark example.
use the --use-ninepatch command flag to use nine patch images.
Change-Id: Ie14eacdf938066343a1d75f6738a3c1dd65a7e81
Xiangyin Ma [Fri, 2 Oct 2015 09:32:20 +0000 (10:32 +0100)]
Added demo of color gradients
Change-Id: I9d1467c53e20d278084499c201b138047d590448
Ferran Sole [Fri, 25 Sep 2015 14:28:30 +0000 (15:28 +0100)]
Added demo to compare performance between ImageActor and ImageView
By default, the application consist of 10 pages of 25x25 ImageActors.
The default values can be modified using the following command line arguments:
-r NumberOfRows (Modifies the number of rows per page)
-c NumberOfColumns (Modifies the number of columns per page)
-p NumberOfPages (Modifies the nimber of pages )
--use-imageview ( Use ImageView instead of ImageActor )
--use-mesh ( Use new renderer API (as ImageView) but shares renderers between actors when possible )
Change-Id: I8a54bd713672433a6f80726972f15d698509dbbe
Chu Hoang [Fri, 2 Oct 2015 09:38:55 +0000 (10:38 +0100)]
DALi Version 1.1.5
Change-Id: I9cbeacbec2990011a1c770608e7cff45e2bd6bb2
Chu Hoang [Tue, 29 Sep 2015 14:53:40 +0000 (15:53 +0100)]
Changed Dissolve effect to use new custom shaders.
Change-Id: I6fe378deddef85558569c8b4d323ddbb79f6421b
Xiangyin Ma [Thu, 24 Sep 2015 16:16:33 +0000 (17:16 +0100)]
Set launcher background from stylesheet
Change-Id: I3bb7ab3711311431cd0cbff0abc2cfdd11ee616d
Ferran Sole [Wed, 30 Sep 2015 11:06:46 +0000 (12:06 +0100)]
Bug fix: Image Scaling Grid example doesn't show "crossbars"
Change-Id: I9dbf15948401036c144535596960b4b2271fc489
Ferran Sole [Tue, 29 Sep 2015 09:42:16 +0000 (10:42 +0100)]
Bug fix: ItemView example's multiple selection checkbox renders below the image
Also fixes a bug where the checkbox of the first items was not being rendered
Change-Id: I7d6b9edec90f1997dc1e9baab0c911e4bb5d74ff
Agnelo Vaz [Fri, 25 Sep 2015 15:59:21 +0000 (16:59 +0100)]
Text-Font example added
* Added to test Font setting via Property system and system font changes.
* 3 Initial TextLabels;
first has no font set,
second is set via the demo json style sheet,
third is set via the SetProperty in code.
Only the first should change when the system font changes to a different font
* Pressing button creates a new TextLabel with the system font
Change-Id: I9291797ba357979d9b3d85ab0d3a30a3fbd6c497
Signed-off-by: Agnelo Vaz <agnelo.vaz@samsung.com>
Kimmo Hoikka [Fri, 25 Sep 2015 14:35:33 +0000 (07:35 -0700)]
Merge "Fixed texture mesh example after changed uniform precedence." into devel/master
Adeel Kazmi [Fri, 25 Sep 2015 07:46:14 +0000 (08:46 +0100)]
DALi Version 1.1.4
Change-Id: I92e974a578824d940629dd2ff1f6b32f260f29df
Ferran Sole [Wed, 23 Sep 2015 09:35:57 +0000 (10:35 +0100)]
Fixed texture mesh example after changed uniform precedence.
Now actor's properties have precedence over Renderers properties as uniforms
Change-Id: Ie893579e3d59bfa4bc4b1b99939b0bf236c2efdd