Revision: 43093
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43093
Author: campbellbarton
Date: 2012-01-03 07:33:11 +0000 (Tue, 03 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43085:43092
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43085
Modified Paths:
--------------
branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.c
branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
branches/bmesh/blender/source/blender/modifiers/SConscript
branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
Property Changed:
----------------
branches/bmesh/blender/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43085
+ /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43092
Modified:
branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.c
2012-01-03 04:23:41 UTC (rev 43092)
+++ branches/bmesh/blender/source/blender/editors/animation/anim_ipo_utils.c
2012-01-03 07:33:11 UTC (rev 43093)
@@ -161,6 +161,11 @@
* 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 */
Modified: branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
2012-01-03 04:23:41 UTC (rev 43092)
+++ branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
2012-01-03 07:33:11 UTC (rev 43093)
@@ -616,9 +616,11 @@
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;
+ }
}
}
Modified: branches/bmesh/blender/source/blender/modifiers/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/modifiers/SConscript 2012-01-03
04:23:41 UTC (rev 43092)
+++ branches/bmesh/blender/source/blender/modifiers/SConscript 2012-01-03
07:33:11 UTC (rev 43093)
@@ -14,10 +14,10 @@
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']:
Modified:
branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
===================================================================
--- branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
2012-01-03 04:23:41 UTC (rev 43092)
+++ branches/bmesh/blender/source/blender/render/intern/source/imagetexture.c
2012-01-03 07:33:11 UTC (rev 43093)
@@ -203,6 +203,13 @@
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 @@
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
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
