Revision: 55053
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55053
Author: blendix
Date: 2013-03-05 14:04:33 +0000 (Tue, 05 Mar 2013)
Log Message:
-----------
svn merge ^/trunk/blender -c55022 -c55026
Modified Paths:
--------------
tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/properties_texture.py
tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h
tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/texture.c
tags/blender-2.66a-release/blender/source/blender/blenloader/intern/readfile.c
tags/blender-2.66a-release/blender/source/blender/editors/render/render_preview.c
tags/blender-2.66a-release/blender/source/blender/gpu/intern/gpu_material.c
tags/blender-2.66a-release/blender/source/blender/makesdna/DNA_texture_types.h
tags/blender-2.66a-release/blender/source/blender/makesrna/intern/rna_texture.c
tags/blender-2.66a-release/blender/source/blender/render/intern/source/imagetexture.c
Property Changed:
----------------
tags/blender-2.66a-release/blender/
Property changes on: tags/blender-2.66a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:54733,54738,54745-54746,54748,54754,54757,54760,54764,54766-54767,54769,54772,54776-54777,54780-54783,54788-54790,54793-54794,54799,54816,54818,54822,54824,54827-54828,54833-54835,54837,54855-54856,54862,54865-54866,54868,54875,54877-54879,54882-54883,54885,54891,54899-54901,54903,54907-54908,54910,54912,54917,54920-54921,54923,54928,54934-54935,54942-54946,54948,54954,54959-54961,54965,54969,54971-54972,54990-54991,54993,54996,55004,55007,55010-55012
+
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/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,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:54733,54738,54745-54746,54748,54754,54757,54760,54764,54766-54767,54769,54772,54776-54777,54780-54783,54788-54790,54793-54794,54799,54816,54818,54822,54824,54827-54828,54833-54835,54837,54855-54856,54862,54865-54866,54868,54875,54877-54879,54882-54883,54885,54891,54899-54901,54903,54907-54908,54910,54912,54917,54920-54921,54923,54928,54934-54935,54942-54946,54948,54954,54959-54961,54965,54969,54971-54972,54990-54991,54993,54996,55004,55007,55010-55012,55022,55026
Modified:
tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/properties_texture.py
===================================================================
---
tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/properties_texture.py
2013-03-05 12:41:17 UTC (rev 55052)
+++
tags/blender-2.66a-release/blender/release/scripts/startup/bl_ui/properties_texture.py
2013-03-05 14:04:33 UTC (rev 55053)
@@ -448,6 +448,9 @@
col = split.column()
col.label(text="Alpha:")
+ row = col.row()
+ row.active = tex.image and tex.image.use_alpha
+ row.prop(tex, "use_alpha", text="Use")
col.prop(tex, "use_calculate_alpha", text="Calculate")
col.prop(tex, "invert_alpha", text="Invert")
col.separator()
Modified:
tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h
2013-03-05 12:41:17 UTC (rev 55052)
+++ tags/blender-2.66a-release/blender/source/blender/blenkernel/BKE_blender.h
2013-03-05 14:04:33 UTC (rev 55053)
@@ -42,7 +42,7 @@
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
#define BLENDER_VERSION 266
-#define BLENDER_SUBVERSION 0
+#define BLENDER_SUBVERSION 1
/* 262 was the last editmesh release but it has compatibility code for bmesh
data */
#define BLENDER_MINVERSION 262
Modified:
tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/texture.c
===================================================================
---
tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/texture.c
2013-03-05 12:41:17 UTC (rev 55052)
+++
tags/blender-2.66a-release/blender/source/blender/blenkernel/intern/texture.c
2013-03-05 14:04:33 UTC (rev 55053)
@@ -440,7 +440,7 @@
tex->type = TEX_CLOUDS;
tex->stype = 0;
tex->flag = TEX_CHECKER_ODD;
- tex->imaflag = TEX_INTERPOL | TEX_MIPMAP;
+ tex->imaflag = TEX_INTERPOL | TEX_MIPMAP | TEX_USEALPHA;
tex->extend = TEX_REPEAT;
tex->cropxmin = tex->cropymin = 0.0;
tex->cropxmax = tex->cropymax = 1.0;
Modified:
tags/blender-2.66a-release/blender/source/blender/blenloader/intern/readfile.c
===================================================================
---
tags/blender-2.66a-release/blender/source/blender/blenloader/intern/readfile.c
2013-03-05 12:41:17 UTC (rev 55052)
+++
tags/blender-2.66a-release/blender/source/blender/blenloader/intern/readfile.c
2013-03-05 14:04:33 UTC (rev 55053)
@@ -8661,8 +8661,8 @@
if (main->versionfile < 265 || (main->versionfile == 265 &&
main->subversionfile < 5)) {
Scene *scene;
- Image *image, *nimage;
- Tex *tex, *otex;
+ Image *image;
+ Tex *tex;
bNodeTreeType *ntreetype;
bNodeTree *ntree;
@@ -8709,67 +8709,17 @@
else {
BKE_image_alpha_mode_from_extension(image);
}
-
- image->flag &= ~IMA_DONE_TAG;
}
- /* use alpha flag moved from texture to image datablock */
for (tex = main->tex.first; tex; tex = tex->id.next) {
if (tex->type == TEX_IMAGE && (tex->imaflag &
TEX_USEALPHA) == 0) {
image = blo_do_versions_newlibadr(fd,
tex->id.lib, tex->ima);
- /* skip if no image or already tested */
- if (!image || (image->flag &
(IMA_DONE_TAG|IMA_IGNORE_ALPHA)))
- continue;
-
- image->flag |= IMA_DONE_TAG;
-
- /* we might have some textures using alpha and
others not, so we check if
- * they exist and duplicate the image datablock
if necessary */
- for (otex = main->tex.first; otex; otex =
otex->id.next)
- if (otex->type == TEX_IMAGE &&
(otex->imaflag & TEX_USEALPHA))
- if (image ==
blo_do_versions_newlibadr(fd, otex->id.lib, otex->ima))
- break;
-
- /* no duplication if the texture and image
datablock are not
- * from the same .blend file, the image
datablock may not have
- * been loaded from a library file otherwise */
- if (otex && (tex->id.lib == image->id.lib)) {
- /* copy image datablock */
- nimage = BKE_image_copy(main, image);
- nimage->flag |=
IMA_IGNORE_ALPHA|IMA_DONE_TAG;
- nimage->id.us--;
-
- /* we need to do some trickery to make
file loading think
- * this new datablock is part of file
we're loading */
-
blo_do_versions_oldnewmap_insert(fd->libmap, nimage, nimage, 0);
- nimage->id.lib = image->id.lib;
- nimage->id.flag |= (image->id.flag &
LIB_NEED_LINK);
-
- /* assign new image, and update the
users counts accordingly */
- for (otex = main->tex.first; otex; otex
= otex->id.next) {
- if (otex->type == TEX_IMAGE &&
(otex->imaflag & TEX_USEALPHA) == 0) {
- if (image ==
blo_do_versions_newlibadr(fd, otex->id.lib, otex->ima)) {
- if
(!(otex->id.flag & LIB_NEED_LINK)) {
-
image->id.us--;
-
nimage->id.us++;
- }
- otex->ima =
nimage;
- break;
- }
- }
- }
- }
- else {
- /* no other textures using alpha, just
set the flag */
+ if (image && (image->flag & IMA_DO_PREMUL) == 0)
image->flag |= IMA_IGNORE_ALPHA;
- }
}
}
- for (image = main->image.first; image; image = image->id.next)
- image->flag &= ~IMA_DONE_TAG;
-
ntreetype = ntreeGetType(NTREE_COMPOSIT);
if (ntreetype && ntreetype->foreach_nodetree)
ntreetype->foreach_nodetree(main, fd,
do_version_node_straight_image_alpha_workaround);
@@ -8777,7 +8727,16 @@
for (ntree = main->nodetree.first; ntree; ntree =
ntree->id.next)
do_version_node_straight_image_alpha_workaround(fd,
NULL, ntree);
}
+ else if (main->versionfile < 266 || (main->versionfile == 266 &&
main->subversionfile < 1)) {
+ /* texture use alpha was removed for 2.66 but added back again
for 2.66a,
+ * for compatibility all textures assumed it to be enabled */
+ Tex *tex;
+ for (tex = main->tex.first; tex; tex = tex->id.next)
+ if (tex->type == TEX_IMAGE)
+ tex->imaflag |= TEX_USEALPHA;
+ }
+
if (main->versionfile < 265 || (main->versionfile == 265 &&
main->subversionfile < 7)) {
Curve *cu;
Modified:
tags/blender-2.66a-release/blender/source/blender/editors/render/render_preview.c
===================================================================
---
tags/blender-2.66a-release/blender/source/blender/editors/render/render_preview.c
2013-03-05 12:41:17 UTC (rev 55052)
+++
tags/blender-2.66a-release/blender/source/blender/editors/render/render_preview.c
2013-03-05 14:04:33 UTC (rev 55053)
@@ -425,16 +425,17 @@
if (tex && sp->slot)
mat->mtex[0]->which_output = sp->slot->which_output;
-
+
+ mat->mtex[0]->mapto &=
~MAP_ALPHA;
+ mat->alpha = 1.0f;
+
/* show alpha in this case */
if (tex == NULL || (tex->flag &
TEX_PRV_ALPHA)) {
- mat->mtex[0]->mapto |=
MAP_ALPHA;
- mat->alpha = 0.0f;
+ if (!(tex && tex->type
== TEX_IMAGE && (tex->imaflag & (TEX_USEALPHA|TEX_CALCALPHA)) == 0)) {
+
mat->mtex[0]->mapto |= MAP_ALPHA;
+ mat->alpha =
0.0f;
+ }
}
- else {
- mat->mtex[0]->mapto &=
~MAP_ALPHA;
- mat->alpha = 1.0f;
- }
}
}
}
Modified:
tags/blender-2.66a-release/blender/source/blender/gpu/intern/gpu_material.c
===================================================================
--- tags/blender-2.66a-release/blender/source/blender/gpu/intern/gpu_material.c
2013-03-05 12:41:17 UTC (rev 55052)
+++ tags/blender-2.66a-release/blender/source/blender/gpu/intern/gpu_material.c
2013-03-05 14:04:33 UTC (rev 55053)
@@ -1035,7 +1035,7 @@
GPU_link(mat, "mtex_image", texco,
GPU_image(tex->ima, &tex->iuser, FALSE), &tin, &trgb);
rgbnor= TEX_RGB;
- talpha = (tex->ima->flag & IMA_IGNORE_ALPHA) ==
0;
+ talpha = ((tex->imaflag & TEX_USEALPHA) &&
tex->ima && (tex->ima->flag & IMA_IGNORE_ALPHA) == 0);
}
else {
continue;
Modified:
tags/blender-2.66a-release/blender/source/blender/makesdna/DNA_texture_types.h
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
