Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-ui-toolkit-fix-black-shape into lp:ubuntu-ui-toolkit

[Loïc Molinari]

[UbuntuShape] Correctly stored the current material.

[UbuntuShape] Correctly stored the current material.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:440
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/1084/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=panda-pbuilder,distribution=quantal,flavor=armhf/1084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=amd64/1084
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/./build=pbuilder-master,distribution=quantal,flavor=i386/1084

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/1084/rebuild

review: Approve (continuous-integration)

=== modified file 'modules/Ubuntu/Components/plugin/shapeitem.cpp'
--- modules/Ubuntu/Components/plugin/shapeitem.cpp	2013-01-08 17:53:08 +0000
+++ modules/Ubuntu/Components/plugin/shapeitem.cpp	2013-04-25 14:21:24 +0000
@@ -509,6 +509,7 @@
             setMaterial(&coloredMaterial_);
         else
             setMaterial(&texturedMaterial_);
+        currentMaterial_ = material;
         markDirty(DirtyMaterial);
     }
 }