Adeel Kazmi [Thu, 13 Aug 2015 19:08:54 +0000 (20:08 +0100)]
Remove Boost completely
Change-Id: Iedeecbfa65be7714db94bc15d94f545d5d5bb6aa
Adeel Kazmi [Fri, 31 Jul 2015 09:11:33 +0000 (10:11 +0100)]
Remove unnecessary timeDelta parameter from PostRender
Change-Id: Ie18c2d9e4b237d430673d7c5ed6f08f34ed23cc0
Adeel Kazmi [Wed, 12 Aug 2015 09:50:16 +0000 (10:50 +0100)]
DALi Version 1.0.53
Change-Id: Ic6d5c2aa2da684eaf17b180157885db9fdf224ec
Kimmo Hoikka [Mon, 10 Aug 2015 15:01:12 +0000 (16:01 +0100)]
Change Epsilon 0 and 1 to use the compiler provided values
Change-Id: I68cb4b0fe5c965c47560a46aa5575836b8f5743c
Xiangyin Ma [Thu, 6 Aug 2015 10:05:16 +0000 (11:05 +0100)]
DALi Version 1.0.52
Change-Id: Ie07d42a55baf409e7b5b5a859e3294eb209d08ad
Tom Robinson [Mon, 27 Jul 2015 16:18:31 +0000 (17:18 +0100)]
New Popup implementation
Change-Id: I8657560f0a83ef7beadf2a312096477ccb1fbb7a
Ferran Sole [Mon, 3 Aug 2015 13:30:39 +0000 (14:30 +0100)]
Re-enable sort modifier ( depth index ) in 3D layers
SortModifier, or DepthIndex in Renderers, is now being considered as an offset to
the Z value used when ordering transparent RenderItems back-to-front
Change-Id: Idc5f5cb825395ed0fb1ace211b11877109dc8ac5
Paul Wisbey [Fri, 31 Jul 2015 15:18:02 +0000 (16:18 +0100)]
Fixed memory corruption in RendererAttachment::DoPrepareRender()
(Fixes crash issue in blocks.example)
Change-Id: I18a3f3690ddc0204a1b69c0687aabae4fc627dad
Yoonsang Lee [Fri, 31 Jul 2015 05:53:43 +0000 (14:53 +0900)]
Update license information in the spec file
Change-Id: I78701683f7b42d44b732749a3c9e737b636889de
Tom Robinson [Thu, 30 Jul 2015 08:26:20 +0000 (09:26 +0100)]
DALi Version 1.0.51
Change-Id: I38cc4bae9ccede9450d48a4286655f3d8ecdb428
Kimmo Hoikka [Wed, 29 Jul 2015 12:02:38 +0000 (13:02 +0100)]
Cleanup platform abstraction API (to allow removal of dead code from Adaptor)
Change-Id: I70b633fa641676d8805f9e854806f54d1372fcbb
Nick Holland [Tue, 28 Jul 2015 15:36:36 +0000 (16:36 +0100)]
Temporarily disable v8 build and install from dali_env
when running dali_env script the v8 installation fails if the
machine is not using a http proxy.
Change-Id: I5caa75723c0a211b045c8ab30744c9777ae1d233
Adeel Kazmi [Tue, 28 Jul 2015 14:42:30 +0000 (07:42 -0700)]
Merge "Stop setting crazy Z value when SetSize(width,height) is used" into devel/master
Paul Wisbey [Thu, 16 Jul 2015 09:28:37 +0000 (10:28 +0100)]
Remove on/off stage behavior from Shader
Change-Id: I2ee41d546fee1c32c017a507ea9bfac9e471822e
Kimmo Hoikka [Thu, 23 Jul 2015 12:42:26 +0000 (13:42 +0100)]
Stop setting crazy Z value when SetSize(width,height) is used
Change-Id: Ic428a491ec271748eac7930a3126c4f9fb5132e3
Paul Wisbey [Thu, 23 Jul 2015 16:59:05 +0000 (17:59 +0100)]
Keep track of Bitmap data ownership
i.e. Disard refers to whether the data can be released after uploading.
ResourcePolicy::RETAIN does not mean that the data is externally owned.
Change-Id: I550f227e5463d677ba7e5ac5e889989360834089
Adeel Kazmi [Mon, 27 Jul 2015 10:40:29 +0000 (03:40 -0700)]
Merge "Changed UtcFrustumNearCullP and UtcFrustumFarCullP to explicitly set the position of the mesh actor instead of relying on the ParentOrigin since the parent might not have any depth. Added more negative tests." into devel/master
Chu Hoang [Fri, 24 Jul 2015 15:22:40 +0000 (16:22 +0100)]
Changed UtcFrustumNearCullP and UtcFrustumFarCullP to explicitly set the position of the mesh actor instead of relying on the ParentOrigin since the parent might not have any depth. Added more negative tests.
Refactored and cleaned up utc-Dali-Internal-FrustumCulling tests.
Change-Id: I5fa7fd85b6cc0866749733d3c13af1202b5cb4a3
Tom Robinson [Thu, 23 Jul 2015 13:58:38 +0000 (14:58 +0100)]
Removed unneeded index param and code from ConnectNode / Child
Change-Id: Ic6dd8519b44d861e3208b4d701d18e3f43776506
Lee Morgan [Thu, 23 Jul 2015 13:17:18 +0000 (14:17 +0100)]
Fix sampler property types
Change-Id: Ida87e40cd5a8c0ffa90fb6ca4e94ab69cccff5bc
Adeel Kazmi [Thu, 23 Jul 2015 11:08:43 +0000 (04:08 -0700)]
Merge "DALi Version 1.0.50" into devel/master
Richard Huang [Thu, 23 Jul 2015 10:55:38 +0000 (11:55 +0100)]
DALi Version 1.0.50
Change-Id: Ibbd0e36ba833d3b024934038b2eda74e59cfd0e3
Kimmo Hoikka [Thu, 23 Jul 2015 08:55:21 +0000 (01:55 -0700)]
Merge "Cleanup dead declaration from ShaderEffect" into devel/master
Kimmo Hoikka [Wed, 22 Jul 2015 14:14:56 +0000 (07:14 -0700)]
Merge "Changed view frustum culling to ignore mesh extents and instead use actor extents." into devel/master
Kimmo Hoikka [Wed, 22 Jul 2015 12:55:15 +0000 (13:55 +0100)]
Cleanup dead declaration from ShaderEffect
Change-Id: I96e27dd7692fcd828a15f4f1900fe9b6865c2788
Chu Hoang [Mon, 20 Jul 2015 15:55:39 +0000 (16:55 +0100)]
Changed view frustum culling to ignore mesh extents and instead use actor extents.
Removed Geometry::mHalfExtents and mRadius since they are no longer relevant.
Change-Id: I3d262e157bc30f7d999c0f73ba23469f7eac37a6
taeyoon [Mon, 20 Jul 2015 02:58:58 +0000 (11:58 +0900)]
Add UTCs for public-api
Change-Id: I50392f9caceebb5a39846058181f79ddada9a443
Kimmo Hoikka [Fri, 17 Jul 2015 15:05:15 +0000 (08:05 -0700)]
Merge "Fixed Actor not callind mAttachment->Connect if Actor::AddRenderer is called after the actor is already on stage." into devel/master
Nick Holland [Fri, 17 Jul 2015 08:25:35 +0000 (09:25 +0100)]
DALi Version 1.0.49
Change-Id: I2f9f863ef1aef95cbf0493bf7c6a30305fd82773
Kimmo Hoikka [Thu, 16 Jul 2015 14:00:48 +0000 (07:00 -0700)]
Merge "Hit test algorithm bug fix" into devel/master
Kimmo Hoikka [Thu, 16 Jul 2015 13:17:20 +0000 (06:17 -0700)]
Merge "Set default behavior in Layer - to fix target UTC fail" into devel/master
Andrew Cox [Wed, 15 Jul 2015 12:56:39 +0000 (13:56 +0100)]
Move ShaderData from integration api to internal
Change-Id: Ibd3cae2fe9c4c08a78e3f99ce3b81f9dfbb2c8f1
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Ferran Sole [Wed, 15 Jul 2015 16:44:15 +0000 (17:44 +0100)]
Hit test algorithm bug fix
Change-Id: Ia601bcd0f9c30106eaab1ed3ebc32711ae9e70e3
Heeyong Song [Thu, 16 Jul 2015 04:55:05 +0000 (13:55 +0900)]
Set default behavior in Layer - to fix target UTC fail
Change-Id: I0340dd33102594f2e619205103e0af2c2bc9aced
Andrew Cox [Wed, 15 Jul 2015 15:42:41 +0000 (16:42 +0100)]
Passing modifiesGeometry flag from Shader and ShaderEffect
Change-Id: Id06feb3b06c9398f691794a23b178a7c44c4d996
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Chu Hoang [Tue, 14 Jul 2015 11:18:21 +0000 (12:18 +0100)]
Fixed Actor not callind mAttachment->Connect if Actor::AddRenderer is called after the actor is already on stage.
Change-Id: Icda4d33e0abae3b91c790076f82493c4062242d6
Tom Robinson [Tue, 14 Jul 2015 15:09:07 +0000 (16:09 +0100)]
Removal of Actor::Insert API
Change-Id: I17c3851fb733d8c97aed024d1c4813e9d3a6fd30
Kimmo Hoikka [Tue, 14 Jul 2015 13:28:43 +0000 (06:28 -0700)]
Merge "Changed draw ordering to take into account the depth of the node in the hierarchy" into devel/master
Andrew Cox [Mon, 13 Jul 2015 17:02:52 +0000 (18:02 +0100)]
Deleted stray scene graph shader SetProgram() using resource id.
Change-Id: Idcfecd861b6f25b05739dbcfd42e7bddc2eb5786
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Ferran Sole [Thu, 9 Jul 2015 15:37:43 +0000 (16:37 +0100)]
Changed draw ordering to take into account the depth of the node in the hierarchy
Tree depth is multiplied by a known factor (10.000) to make it dominate the ordering.
Allows controls to still put renderers on top of their children as long as they know
the depth of the child tree
Change-Id: I3793b036150d39a930e9c55da1ea5b16febfd571
Kimmo Hoikka [Mon, 13 Jul 2015 17:50:35 +0000 (10:50 -0700)]
Merge "Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D" into devel/master
Adeel Kazmi [Mon, 13 Jul 2015 16:52:22 +0000 (17:52 +0100)]
Fix SceneGraph::Material header include
Change-Id: Ifae4110dbda898b5738b4806ce62288afbeabb2f
Andrew Cox [Mon, 13 Jul 2015 14:48:10 +0000 (15:48 +0100)]
Removed Resource Saving
Change-Id: I4fe2a6b00e364e39a321bc7c13f4a4980350f766
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Richard Huang [Mon, 13 Jul 2015 13:40:21 +0000 (14:40 +0100)]
Change DrawMode::OVERLAY to DrawMode::OVERLAY_2D
Change-Id: If2392f95fa4d7ec2e3605d91e6aa9088b48b3104
Kimmo Hoikka [Mon, 13 Jul 2015 14:01:09 +0000 (07:01 -0700)]
Merge "Remove RenderableActor" into devel/master
Adeel Kazmi [Mon, 13 Jul 2015 11:17:31 +0000 (12:17 +0100)]
Remove RenderableActor
Change-Id: Ie92dea9a3301ba3e6226a097684689ab0e04d561
Andrew Cox [Fri, 12 Jun 2015 19:23:55 +0000 (20:23 +0100)]
Shader binary synchronous simplified IO
Loading shader binaries synchronously on event thread.
Saving shader binaries from ShaderFactory on event thread.
Deleted old resource sytem based shader binary loading.
Change-Id: I38a79a7b4e9eb33d9a5059f1c43d9e8c892b0867
Signed-off-by: Andrew Cox <andrew.cox@partner.samsung.com>
Ferran Sole [Wed, 8 Jul 2015 10:56:10 +0000 (11:56 +0100)]
Bug fix which makes applications crash when adding a renderer to an on stage actor
Change-Id: I8db74fac8cad03cc3a8fa5d2f86267882c1baa93
Kimmo Hoikka [Fri, 10 Jul 2015 14:47:14 +0000 (07:47 -0700)]
Merge "New parameter for FrameBufferImage creation" into devel/master
Ferran Sole [Fri, 3 Jul 2015 16:26:48 +0000 (17:26 +0100)]
Allow sharing RenderGeometries across multiple Renderers
Change-Id: I48d337a4d258e067fd5e01ad7075b24984092dcb
David Fumanal [Fri, 26 Jun 2015 14:07:50 +0000 (15:07 +0100)]
New parameter for FrameBufferImage creation
Change-Id: I2d5898848ec7c76dea78d60d3da64a24ccd496be
Kimmo Hoikka [Thu, 9 Jul 2015 17:34:05 +0000 (18:34 +0100)]
Remove de-funct dynamics support
Change-Id: I9633610eb33e9952dd3f10539e7272ed19287757
Adeel Kazmi [Thu, 9 Jul 2015 16:10:56 +0000 (09:10 -0700)]
Merge "DALi Version 1.0.48" into devel/master
Lee Morgan [Thu, 9 Jul 2015 14:03:17 +0000 (15:03 +0100)]
DALi Version 1.0.48
Change-Id: I501559f0819bc872c246578515f9866d9716388b
Kimmo Hoikka [Wed, 8 Jul 2015 14:24:06 +0000 (15:24 +0100)]
Remove UNSIGNED_INTEGER property type as it does not fully work and causes headache
Change-Id: I76a5607ed0a16d29029dd968e684f29189bf4ea5
Kimmo Hoikka [Tue, 7 Jul 2015 10:46:01 +0000 (11:46 +0100)]
Allow property conversions: float from int and int from float
Change-Id: Ic304cfb187cfba6fdd65d34764a6634e4fcd5d43
Adeel Kazmi [Wed, 8 Jul 2015 12:59:35 +0000 (05:59 -0700)]
Merge "Fix issues and added Wextra flag." into devel/master
Adeel Kazmi [Tue, 7 Jul 2015 09:31:07 +0000 (02:31 -0700)]
Merge "Fix Klocwork issue." into devel/master
Adeel Kazmi [Tue, 7 Jul 2015 09:06:29 +0000 (02:06 -0700)]
Merge "Remove utc-Dali-GlyphImage.cpp" into devel/master
Victor Cebollada [Mon, 6 Jul 2015 09:46:13 +0000 (10:46 +0100)]
Fix Klocwork issue.
Change-Id: I134af7bf46aec9226f406d6f7ec81103fef52150
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Francisco Santos [Wed, 1 Jul 2015 14:05:57 +0000 (15:05 +0100)]
Fix issues and added Wextra flag.
Change-Id: Ifcdf9f7620ed4b19d80482beeb100fb4e28c5685
Adeel Kazmi [Fri, 3 Jul 2015 09:51:53 +0000 (10:51 +0100)]
Harmonize test failures
Change-Id: Ibed413b277af32ad4b30426fcec317aed93d3895
Adeel Kazmi [Thu, 2 Jul 2015 16:47:38 +0000 (09:47 -0700)]
Merge "Fix in CompareItems" into devel/master
Adeel Kazmi [Thu, 2 Jul 2015 13:55:17 +0000 (06:55 -0700)]
Merge "Added api to check actor's depth in the hierarchy" into devel/master
Heeyong Song [Thu, 2 Jul 2015 09:34:20 +0000 (18:34 +0900)]
Fix in CompareItems
Change-Id: Id8f480a3b2f517ade6749c79c6ae0a1d1c4e6721
Ferran Sole [Thu, 2 Jul 2015 09:41:11 +0000 (10:41 +0100)]
Commented test case until proper fix
Failed test case in PropertyBuffer was causing all verifications
by build server to fail. Commented until the proper fix can be merged.
Change-Id: Iba6a1935e92d6ed7c991d74c98810f59e1108013
Adeel Kazmi [Wed, 1 Jul 2015 16:54:55 +0000 (09:54 -0700)]
Merge "Bug fix when changing geometry in a Renderer" into devel/master
Ferran Sole [Mon, 29 Jun 2015 16:27:15 +0000 (17:27 +0100)]
Added api to check actor's depth in the hierarchy
Change-Id: Iafa09ddf3fb0c1507693330714a3675d9c9f6f61
Adeel Kazmi [Wed, 1 Jul 2015 13:23:21 +0000 (06:23 -0700)]
Merge "DALi Version 1.0.47" into devel/master
Ferran Sole [Wed, 1 Jul 2015 13:18:07 +0000 (14:18 +0100)]
DALi Version 1.0.47
Change-Id: Ib2e1b826560776c8152b3543cb7f75609cbde6ff
Kimmo Hoikka [Tue, 30 Jun 2015 13:29:44 +0000 (14:29 +0100)]
Change state before releasing mutex
Change-Id: I696606f63baa61eb20585e9f5fb86f6da0ea56d2
David Fumanal [Wed, 1 Jul 2015 09:53:09 +0000 (10:53 +0100)]
Fix in RenderAttachment destructor
Change-Id: I2bb8be038314b07cd410a3ab28739b35cb843926
David Fumanal [Mon, 29 Jun 2015 16:40:22 +0000 (17:40 +0100)]
Fix double deletion in message.
Change-Id: I345a11ae68ca85ab2bc02dd6aba6cef8ba323e4b
Ferran Sole [Tue, 30 Jun 2015 10:50:51 +0000 (11:50 +0100)]
Bug fix when changing geometry in a Renderer
Attribute location vector in RenderPropertyBuffer was not being updated when geometry changed.
Change-Id: I3bb5b13f552965790fbb8c4738fdd9372d618a07
Yoonsang Lee [Mon, 29 Jun 2015 09:24:08 +0000 (18:24 +0900)]
Remove utc-Dali-GlyphImage.cpp
- This file is not built (not included in CMakeLists.txt) and class GlyphImage even does not exist any more (after merge of new_text)
Change-Id: Id7d69b8e9b49df0a2241bec860a533ae60f541ee
root [Mon, 29 Jun 2015 13:14:59 +0000 (14:14 +0100)]
Remove Cloth, DynamicsShape::MESH; Remove 'enable-dynamics' from configure
Change-Id: I864bfdc6283152b969df8a3cec8fa231ffeac3e4
Kimmo Hoikka [Mon, 29 Jun 2015 13:56:53 +0000 (14:56 +0100)]
Remove unused & unnecessary fitting functions from Vector2 & Vector3
Change-Id: Ia12b4da6f718f2fabca942fa5a51a987093d84df
Kimmo Hoikka [Mon, 29 Jun 2015 12:07:44 +0000 (13:07 +0100)]
Performance optimizing actor-impl & relayout controller
- Store child actors as intrusive pointers rather than handles
- Stop using public handles in internal code in actor (removes about a dozen unnecessary GetImplementation calls)
- Stop calling Stage::GetCurrent().GetSize every size negotiation, store it internally instead
Change-Id: I18615aa1f8d2c736cd8502fa02de55e9146a1ef6
HyunJu Shin [Mon, 29 Jun 2015 10:03:14 +0000 (03:03 -0700)]
Merge "Remove Random::Chance()" into devel/master
suhyung Eom [Mon, 29 Jun 2015 07:36:24 +0000 (16:36 +0900)]
Implement additional UTC
Signed-off-by: suhyung Eom <suhyung.eom@samsung.com>
Change-Id: I36e35ea1675f6f34b7850cb19a8902e8c61e8741
Yoonsang Lee [Mon, 29 Jun 2015 01:16:43 +0000 (10:16 +0900)]
Remove Random::Chance()
Change-Id: Ib78940c744e5d9c689c7cecb44815d07e133e1af
Francisco Santos [Fri, 26 Jun 2015 18:11:10 +0000 (19:11 +0100)]
Stage member has been removed from actor.
Change-Id: I7eb63d20edbe087cf1e9dde4d6bcb427cd091785
Adeel Kazmi [Fri, 26 Jun 2015 17:37:23 +0000 (10:37 -0700)]
Merge "Merge branch 'devel/new_mesh' into devel/master" into devel/master
Francisco Santos [Fri, 26 Jun 2015 14:18:45 +0000 (15:18 +0100)]
Merge branch 'devel/new_mesh' into devel/master
Change-Id: I491fcf5f6663e8de6bba090279d3f35420453129
Francisco Santos [Fri, 26 Jun 2015 14:00:14 +0000 (15:00 +0100)]
Merge branch 'devel/master' into devel/new_mesh
Change-Id: Ibaa203f8ccb1e3526faac8b168440c7a41ec6c69
Adeel Kazmi [Thu, 25 Jun 2015 17:56:54 +0000 (18:56 +0100)]
(Actor) Stop creating RelayoutData struct in getters
Change-Id: Ibbdc0991c8a3ad612a65be3a76ea28bc2ee12ec0
Victor Cebollada [Thu, 25 Jun 2015 09:33:09 +0000 (10:33 +0100)]
Fix for SizeNegotiation.
The RelayoutController::RequestRelayout() does not add a dirty Actor to the
request list if it has a child which is not dependant on it.
Change-Id: I7f4131d58dfe4a7135cf7e3e8077c86e83b44133
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Francisco Santos [Thu, 25 Jun 2015 13:25:07 +0000 (14:25 +0100)]
Merge branch 'devel/master' into devel/new_mesh
Conflicts:
automated-tests/src/dali-devel/mesh-builder.cpp
automated-tests/src/dali-devel/mesh-builder.h
automated-tests/src/dali-devel/utc-Dali-AnimatableMesh.cpp
automated-tests/src/dali-devel/utc-Dali-DynamicsShape.cpp
automated-tests/src/dali-devel/utc-Dali-MeshActor.cpp
automated-tests/src/dali-devel/utc-Dali-MeshData.cpp
automated-tests/src/dali-internal/CMakeLists.txt
automated-tests/src/dali/dali-test-suite-utils/dali-test-suite-utils.cpp
automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
dali/devel-api/dynamics/dynamics-shape.cpp
dali/integration-api/profiling.h
dali/internal/event/actors/actor-impl.cpp
dali/internal/event/common/property-helper.h
dali/internal/event/effects/shader-effect-impl.cpp
dali/internal/event/events/hit-test-algorithm-impl.cpp
dali/internal/event/modeling/animatable-mesh-impl.cpp
dali/internal/update/modeling/scene-graph-animatable-mesh.cpp
Change-Id: If6d0998584a46ed811855237d340a7fa388c4451
Adeel Kazmi [Wed, 24 Jun 2015 16:47:31 +0000 (09:47 -0700)]
Merge "Fix crash on removal of Renderers from stage." into devel/new_mesh
Adeel Kazmi [Wed, 24 Jun 2015 16:46:25 +0000 (09:46 -0700)]
Merge "Fixes scale issue in Frustum Culling" into devel/new_mesh
Adeel Kazmi [Wed, 24 Jun 2015 16:46:23 +0000 (09:46 -0700)]
Merge "Removed DepthIndex methods from public-api" into devel/new_mesh
Chu Hoang [Wed, 24 Jun 2015 14:54:20 +0000 (15:54 +0100)]
DALi Version 1.0.46
Change-Id: Iad4ab1c54d8a5fa3a07036736068f14669b5863f
Francisco Santos [Wed, 24 Jun 2015 13:35:09 +0000 (14:35 +0100)]
Fix crash on removal of Renderers from stage.
Change-Id: I117b78d4e48edf465500051647a57c0d6430a37a
Richard Underhill [Wed, 24 Jun 2015 12:57:25 +0000 (13:57 +0100)]
Fixes scale issue in Frustum Culling
Change-Id: I7b15e52b1e387981638ee622dfe463fb253fefe7
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Richard Underhill [Wed, 24 Jun 2015 10:29:19 +0000 (11:29 +0100)]
Removed DepthIndex methods from public-api
Needs: https://review.tizen.org/gerrit/#/c/42201/
https://review.tizen.org/gerrit/#/c/42203/
Change-Id: If6a14183e3d4f87125484b1dd4ff88b8aae38832
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>
Francisco Santos [Tue, 23 Jun 2015 13:10:19 +0000 (14:10 +0100)]
Move new mesh API to devel-api
Change-Id: I35c1dbf42048a468ee0b51d4913b8f393322fe22
Kimmo Hoikka [Wed, 24 Jun 2015 10:05:41 +0000 (03:05 -0700)]
Merge "Revert "Move new mesh API to devel-api"" into devel/new_mesh
Kimmo Hoikka [Wed, 24 Jun 2015 10:05:33 +0000 (03:05 -0700)]
Revert "Move new mesh API to devel-api"
This reverts commit
174599e5921a33ac4b457369d9d96cc204741970.
Change-Id: I443072220d03adf27f109b67b06749c999f2f36b
Kimmo Hoikka [Wed, 24 Jun 2015 09:59:26 +0000 (02:59 -0700)]
Merge changes I539c58fc,I6e1141c1 into devel/new_mesh
* changes:
Move new mesh API to devel-api
Update profiling of objects with new mesh objects.
Kimmo Hoikka [Wed, 24 Jun 2015 09:58:59 +0000 (02:58 -0700)]
Merge "Add behaviour for 2D / 3D layers." into devel/new_mesh
projects / platform / core / uifw / dali-core.git / log