Squashed commit of the following:

commit 2b9f63089534356607ad7e0ddde6f22e42d04f80
Merge: 98d491f a89e30a
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Feb 29 12:12:11 2012 -0800

    Merge pull request #88 from mqg734/ToolFixes

    Fix for performance issue when moving shapes.

commit 98d491f7e57ff5a9b091e332d7d1e81061e39efa
Merge: 052d980 d417b33
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Feb 29 12:10:57 2012 -0800

    Merge branch 'SnapManagerFixes' of https://github.com/mqg734/ninja-internal into integration-candidate

commit 052d9805a6f0a3a90d6849eb94eabffb7ec26962
Merge: 3d233f2 2f3e4d1
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Feb 29 12:10:03 2012 -0800

    Merge branch 'integration-candidate' of github.com:Motorola-Mobility/ninja-internal into integration-candidate

commit 3d233f25cff057fff5c5a75e4c4b40e88c22a8f5
Merge: 3dbe798 209e078
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Feb 29 12:09:43 2012 -0800

    Merge branch 'NiveshColor' of https://github.com/mqg734/ninja-internal into integration-candidate

commit 2f3e4d12aa15077d3cc9794862156e57b7815e68
Merge: 850f3a1 0996a51
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Feb 29 12:06:21 2012 -0800

    Merge pull request #87 from joseeight/FileIO-Build-Candidate

    Fixes to preview caching issues

commit 850f3a1f7ab81ec80b6de1c49f2d2bbcbfe87c8e
Merge: 1568367 5f777eb
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Feb 29 12:05:48 2012 -0800

    Merge pull request #86 from imix23ways/Timeline

    Timeline

commit 1568367213e760463f3ee29a531aa345fda6bd6d
Merge: 3dbe798 271a8f2
Author: Valerio Virgillito <valerio@motorola.com>
Date:   Wed Feb 29 12:03:23 2012 -0800

    Merge pull request #85 from pushkarjoshi/brushtool

    Brushtool

commit a89e30ab834a48be32b6122e0c8ac1e0c3ed43e8
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Wed Feb 29 11:58:28 2012 -0800

    Fix for performance issue when moving shapes.  We don't need to call render except if the geometry and materials change.

    This is more easy to see with shapes like the brush tool.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 271a8f2b29d87d12c81d03e3f1e2c05b816a138d
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 29 11:50:41 2012 -0800

    prevent extremely long path rendering (temporary fix)

commit 0996a519afccbed526912807c70c20d598e9cae7
Merge: 98f1cfc 03d277d
Author: Jose Antonio Marquez <kgq387@motorola.com>
Date:   Wed Feb 29 11:46:59 2012 -0800

    Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate

commit 03d277db80b6cea9a25320c0575ae2bf7a6d7e6e
Author: Jose Antonio Marquez <kgq387@motorola.com>
Date:   Wed Feb 29 11:46:44 2012 -0800

    Preview Fix

    Adding save all logic before preview, temporary fix.

commit 46fb52be241dced940d46629c809a09c86ed4438
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 29 11:38:33 2012 -0800

    changed the registration point of the brush tool icon and

    added a temporary check to prevent extremely long brush strokes

commit 98f1cfc58f545702a18166ab216362d667c18915
Merge: da83f44 bb3e42b
Author: Jose Antonio Marquez <kgq387@motorola.com>
Date:   Wed Feb 29 11:29:09 2012 -0800

    Merge branch 'refs/heads/FileIO' into FileIO-Build-Candidate

commit bb3e42b531848b400670df6caf0f3ce02adf1243
Author: Jose Antonio Marquez <kgq387@motorola.com>
Date:   Wed Feb 29 11:28:58 2012 -0800

    Fix: Caching issue with chrome tab API

    Using window.open to test movie.

commit f000a3cced9adbfff1d7aa641e6eb42ad6edf7e8
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 29 10:21:06 2012 -0800

    change in comment only

commit 795329d2225ff3b760f7f0ea3bb6b5e68f6c6b5b
Author: Jose Antonio Marquez <kgq387@motorola.com>
Date:   Wed Feb 29 10:07:53 2012 -0800

    Making class level url template variable

    Created a class level variable for the URL to be parsed out of the user files.

commit f931c48a7d0bcf1222cf05787e3294839ed0b9fb
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Wed Feb 29 09:47:41 2012 -0800

    resample the brush stroke so we don't have gaps if the path is drawn rapidly,

    and,
    allow to change the stroke color,
    and,
    more efficient stroke rendering by drawing translated radial gradients (instead of creating new gradients for each stroke sample)

commit d417b3315f1aa6dd52fea10cbf5f17a213ef8726
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Wed Feb 29 06:50:51 2012 -0800

    SnapManager fixes for sag tags.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit 209e0781e926212bbaaad9e8ca4b61a0c389b30f
Author: Nivesh Rajbhandari <mqg734@motorola.com>
Date:   Tue Feb 28 17:19:42 2012 -0800

    We need to remove color buttons from the color model when updating the PI for selection change.

    Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>

commit b43efdcbfa671a46d1edaeb1555f508fe2ad0338
Merge: 16d6a90 f2ab699
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Tue Feb 28 14:55:08 2012 -0800

    Merge branch 'pentool' into brushtool

commit 16d6a90579cdafede931a9c818689fad2e622d8b
Merge: 03ca7a5 63307c9
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Tue Feb 28 14:19:25 2012 -0800

    Merge branch 'pentool' into brushtool

commit 03ca7a5ed13c25faaa9100bb666e062fd15335e6
Merge: fcb12cc 053fc63
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Fri Feb 24 12:08:49 2012 -0800

    Merge branch 'pentool' into brushtool

    Conflicts:
    	imports/codemirror/mode/scheme/scheme.js
    	js/tools/BrushTool.js

commit fcb12cc09eb3cd3b42bd215877ba18f449275b75
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Fri Feb 10 14:16:56 2012 -0800

    render the brush stroke as a sequence of rectangles, with each rectangle having its own linear gradient

commit 6bb00e69713bd7131b2bc0a15e4e0cb6071d616c
Merge: 5f42bd1 666ae3e
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Thu Feb 9 13:42:59 2012 -0800

    Merge branch 'master' into brushtool

commit 5f42bd1f7723483d374cdd3fe51ef8298c86a1a2
Merge: abeb9f1 fba39db
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Thu Feb 9 10:55:58 2012 -0800

    Merge branch 'pentool' into brushtool

commit abeb9f1e23679200bb2f4a3ccbcebfb37645975c
Author: Pushkar Joshi <pushkar@motorola.com>
Date:   Thu Feb 9 10:45:50 2012 -0800

    first phase of simple resampling to prevent tiny segments

Signed-off-by: Jonathan Duran <jduran@motorola.com>

1 files changed, 5 insertions, 0 deletions

diff --git a/js/panels/properties/sections/custom.reel/custom.js b/js/panels/properties/sections/custom.reel/custom.js
index a2b9b9fa..a537d323 100755
--- a/js/panels/properties/sections/custom.reel/custom.js
+++ b/js/panels/properties/sections/custom.reel/custom.js
@@ -59,6 +59,8 @@ exports.CustomSection = Montage.create(Component, {
                         if(obj1.visible === false) tmpRow.colorVisible = obj1.visible;
                         if(obj2.visible === false) tmpRow.color2Visible = obj2.visible;
 
+                        // TODO - Hack for now to reference the color select object to unregister color chips
+                        this.controls["colorSelect"] = tmpRow;
                     }
                     else
                     {
@@ -344,6 +346,9 @@ exports.CustomSection = Montage.create(Component, {
 
             this.controls[aField.id] = obj;
 
+            // TODO - Hack for now to reference the color select object to unregister color chips
+            this.controls["stageBackground"] = obj;
+
             return obj;
         }
     }