diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-03 11:33:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-03 11:33:11 +0400 |
| commit | 46f2233a9355ba09aaa9195c4da32a015f02fb8d (patch) | |
| tree | 64769fdf96c089feb16d10948e8d07617c97d48a /source | |
| parent | c0eec8f379bb0c265e7bf2ad74397c22836bae3c (diff) | |
| parent | 434c1e6df82a082fe03034a3ad3825f7b50ea533 (diff) | |
svn merge ^/trunk/blender -r43085:43092
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/animation/anim_ipo_utils.c | 5 | ||||
| -rw-r--r-- | source/blender/editors/object/object_vgroup.c | 8 | ||||
| -rw-r--r-- | source/blender/modifiers/SConscript | 2 | ||||
| -rw-r--r-- | source/blender/render/intern/source/imagetexture.c | 12 |
4 files changed, 18 insertions, 9 deletions
diff --git a/source/blender/editors/animation/anim_ipo_utils.c b/source/blender/editors/animation/anim_ipo_utils.c index 8e36e02bbb4..8c4e0065a19 100644 --- a/source/blender/editors/animation/anim_ipo_utils.c +++ b/source/blender/editors/animation/anim_ipo_utils.c @@ -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 */ diff --git a/source/blender/editors/object/object_vgroup.c b/source/blender/editors/object/object_vgroup.c index 7a5fe38865b..c5afc740c24 100644 --- a/source/blender/editors/object/object_vgroup.c +++ b/source/blender/editors/object/object_vgroup.c @@ -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; + } } } diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index bfd96c5868f..4ab3874d6fe 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -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']: diff --git a/source/blender/render/intern/source/imagetexture.c b/source/blender/render/intern/source/imagetexture.c index 785d9ac69d8..0b6e1b8ee01 100644 --- a/source/blender/render/intern/source/imagetexture.c +++ b/source/blender/render/intern/source/imagetexture.c @@ -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 |