griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

svn merge ^/trunk/blender -r43085:43092

Browse Source
This commit is contained in:
Campbell Barton
2012-01-03 07:33:11 +00:00
parent c0eec8f379 434c1e6df8
commit 46f2233a93
4 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/animation/anim_ipo_utils.c
View File

@@ -161,6 +161,11 @@ int getname_anim_fcurve(char *name, ID *id, FCurve *fcu)
* use the struct's icon if it is set
*/
icon= RNA_struct_ui_icon(ptr.type);
/* valid path - remove the invalid tag since we now know how to use it saving
* users manual effort to reenable using "Revive Disabled FCurves" [#29629]
*/
fcu->flag &= ~FCURVE_DISABLED;
}
else {
/* invalid path */

8
source/blender/editors/object/object_vgroup.c
View File

@@ -616,9 +616,11 @@ static void vgroup_select_verts(Object *ob, int select)
dv = me->dvert;
for (i=0; i<me->totvert; i++, mv++, dv++) {
if (defvert_find_index(dv, def_nr)) {
if (select) mv->flag |= SELECT;
else mv->flag &= ~SELECT;
if (!(mv->flag & ME_HIDE)) {
if (defvert_find_index(dv, def_nr)) {
if (select) mv->flag |= SELECT;
else mv->flag &= ~SELECT;
}
}
}

2
source/blender/modifiers/SConscript
View File

@@ -14,10 +14,10 @@ incs += ' ' + env['BF_ZLIB_INC']
defs = []
if env ['WITH_BF_BOOLEAN']:
incs += ' #/intern/dualcon'
defs.append('WITH_MOD_BOOLEAN')
if env['WITH_BF_REMESH']:
incs += ' #/intern/dualcon'
defs.append('WITH_MOD_REMESH')
if env ['WITH_BF_DECIMATE']:

12
source/blender/render/intern/source/imagetexture.c
View File

@@ -203,6 +203,13 @@ int imagewrap(Tex *tex, Image *ima, ImBuf *ibuf, const float texvec[3], TexResul
ibuf->rect+= (ibuf->x*ibuf->y);
}
/* keep this before interpolation [#29761] */
if (tex->imaflag & TEX_USEALPHA) {
if ((tex->imaflag & TEX_CALCALPHA) == 0) {
texres->talpha = TRUE;
}
}
/* interpolate */
if (tex->imaflag & TEX_INTERPOL) {
float filterx, filtery;
@@ -225,11 +232,6 @@ int imagewrap(Tex *tex, Image *ima, ImBuf *ibuf, const float texvec[3], TexResul
ibuf->rect-= (ibuf->x*ibuf->y);
}
if(tex->imaflag & TEX_USEALPHA) {
if(tex->imaflag & TEX_CALCALPHA);
else texres->talpha= 1;
}
if(texres->nor) {
if(tex->imaflag & TEX_NORMALMAP) {
// qdn: normal from color