svn merge ^/trunk/blender -r43085:43092
authorCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jan 2012 07:33:11 +0000 (07:33 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 3 Jan 2012 07:33:11 +0000 (07:33 +0000)
source/blender/editors/animation/anim_ipo_utils.c
source/blender/editors/object/object_vgroup.c
source/blender/modifiers/SConscript
source/blender/render/intern/source/imagetexture.c

index 8e36e02bbb469ba4c15109d578a8e290051d3abf..8c4e0065a1922095e66d71e62cef3e42bdfb5cea 100644 (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 */
index 7a5fe38865b0803c4e306074fb04e947b2deebaf..c5afc740c24760127c0e76752a3beca63dc6329e 100644 (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;
+                                               }
                                        }
                                }
 
index bfd96c5868fcbeb7b1c00eb96d123bbd04cbce02..4ab3874d6fec43337bf44df6a2edcec6b924974f 100644 (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']:
index 785d9ac69d80daa3b98063ab5e2df46109cb7b50..0b6e1b8ee01c8e2f1769981e8c4985257c33556b 100644 (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