[Bf-blender-cvs] [a93ec34] master: Fix minor issues from recent commits.

[Antony Riakiotakis]

Commit: a93ec34ac836184cb660c620b1bddde54e240afb
Author: Antony Riakiotakis
Date:   Thu Jul 24 12:08:23 2014 +0200
Branches: master
https://developer.blender.org/rBa93ec34ac836184cb660c620b1bddde54e240afb

Fix minor issues from recent commits.

* Clone from layer UI not working
* Get trash color when entering texture painting for the first time

===================================================================

M	release/scripts/startup/bl_ui/properties_paint_common.py
M	source/blender/editors/sculpt_paint/paint_image_proj.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_paint_common.py b/release/scripts/startup/bl_ui/properties_paint_common.py
index f80a5e5..6504701 100644
--- a/release/scripts/startup/bl_ui/properties_paint_common.py
+++ b/release/scripts/startup/bl_ui/properties_paint_common.py
@@ -154,7 +154,7 @@ def brush_texpaint_common(panel, context, layout, brush, settings, projpaint=Fal
                 if mat:
                     col.label("Clone Slot")
                     col.template_list("TEXTURE_UL_texpaintslots", "",
-                                      mat, "texture_paint_slots",
+                                      mat, "texture_paint_images",
                                       mat, "paint_clone_slot", rows=2)
 
         else:
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 8dfab79..6c41c8e 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -4849,7 +4849,7 @@ bool proj_paint_add_slot(bContext *C, Material *ma, wmOperator *op)
 				mtex->mapto = type;
 
 				if (mtex->tex) {
-					float color[4];
+					float color[4] = {0.0f, 0.0f, 0.0f, 1.0f};
 					char imagename[MAX_ID_NAME - 2] = "Material Diffuse Color";
 					int width = 1024;
 					int height = 1024;