kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix minor issues from recent commits.

Browse Source 
* Clone from layer UI not working
* Get trash color when entering texture painting for the first time
This commit is contained in:
Antony Riakiotakis 2014-07-24 12:08:23 +02:00
parent 029be6f4b5
commit a93ec34ac8
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/startup/bl_ui/properties_paint_common.py
View File

@ -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:

2
source/blender/editors/sculpt_paint/paint_image_proj.c
View File

@ -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;