Revision: 42304
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42304
Author: campbellbarton
Date: 2011-12-01 00:34:59 +0000 (Thu, 01 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42292:42303
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42292
Modified Paths:
--------------
branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h
branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/object/object_bake.c
branches/bmesh/blender/source/blender/editors/space_text/text_draw.c
branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42292
+ /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42303
Modified: branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h
===================================================================
--- branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h 2011-11-30
22:23:40 UTC (rev 42303)
+++ branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h 2011-12-01
00:34:59 UTC (rev 42304)
@@ -94,11 +94,11 @@
float c0hiy = n0xy.w * idir.y - ood.y;
float c0loz = nz.x * idir.z - ood.z;
float c0hiz = nz.y * idir.z - ood.z;
+ float c0min = max4(min(c0lox, c0hix), min(c0loy, c0hiy), min(c0loz,
c0hiz), 0.0f);
+ float c0max = min4(max(c0lox, c0hix), max(c0loy, c0hiy), max(c0loz,
c0hiz), t);
+
float c1loz = nz.z * idir.z - ood.z;
float c1hiz = nz.w * idir.z - ood.z;
-
- float c0min = max4(min(c0lox, c0hix), min(c0loy, c0hiy), min(c0loz,
c0hiz), 0.0f);
- float c0max = min4(max(c0lox, c0hix), max(c0loy, c0hiy), max(c0loz,
c0hiz), t);
float c1lox = n1xy.x * idir.x - ood.x;
float c1hix = n1xy.y * idir.x - ood.x;
float c1loy = n1xy.z * idir.y - ood.y;
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42292
+ /trunk/blender/release:31524-42303
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
2011-11-30 22:23:40 UTC (rev 42303)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
2011-12-01 00:34:59 UTC (rev 42304)
@@ -709,11 +709,7 @@
mtex->size[1]= 1.0;
mtex->size[2]= 1.0;
mtex->tex= NULL;
-
- /* MTEX_BUMP_FLIPPED is temporary before 2.61 release to prevent
flipping normals
- when creating file in 2.60, opening it in 2.59, saving and opening
in 2.60 again */
- mtex->texflag= MTEX_3TAP_BUMP | MTEX_BUMP_OBJECTSPACE |
MTEX_BUMP_FLIPPED;
-
+ mtex->texflag= MTEX_3TAP_BUMP | MTEX_BUMP_OBJECTSPACE;
mtex->colormodel= 0;
mtex->r= 1.0;
mtex->g= 0.0;
Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2011-11-30 22:23:40 UTC (rev 42303)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
2011-12-01 00:34:59 UTC (rev 42304)
@@ -12509,34 +12509,6 @@
sce->gm.recastData.detailsamplemaxerror
= 1.0f;
}
}
-
- {
- /* flip normals */
- Material *ma= main->mat.first;
- while(ma) {
- int a;
- for(a= 0; a<MAX_MTEX; a++) {
- MTex *mtex= ma->mtex[a];
-
- if(mtex) {
-
if((mtex->texflag&MTEX_BUMP_FLIPPED)==0) {
-
if((mtex->mapto&MAP_DISPLACE)==0) {
-
if((mtex->mapto&MAP_NORM) &&
mtex->texflag&(MTEX_COMPAT_BUMP|MTEX_3TAP_BUMP|MTEX_5TAP_BUMP)) {
- Tex
*tex= newlibadr(fd, lib, mtex->tex);
-
- if(!tex
|| (tex->imaflag&TEX_NORMALMAP)==0) {
-
mtex->norfac= -mtex->norfac;
-
mtex->texflag|= MTEX_BUMP_FLIPPED;
- }
- }
- }
- }
- }
- }
-
- ma= ma->id.next;
- }
- }
}
if (main->versionfile < 260){
Modified: branches/bmesh/blender/source/blender/editors/object/object_bake.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/object/object_bake.c
2011-11-30 22:23:40 UTC (rev 42303)
+++ branches/bmesh/blender/source/blender/editors/object/object_bake.c
2011-12-01 00:34:59 UTC (rev 42304)
@@ -1083,6 +1083,8 @@
ob= base->object;
+ multires_force_update(ob);
+
/* copy data stored in job descriptor */
bkr.bake_filter= scene->r.bake_filter;
bkr.mode= scene->r.bake_mode;
@@ -1120,6 +1122,8 @@
MultiresBakerJobData *data;
ob= base->object;
+ multires_force_update(ob);
+
data= MEM_callocN(sizeof(MultiresBakerJobData), "multiresBaker
derivedMesh_data");
data->lores_dm = multiresbake_create_loresdm(scene, ob,
&data->lvl);
data->hires_dm = multiresbake_create_hiresdm(scene, ob,
&data->tot_lvl, &data->simple);
Property changes on:
branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-42292
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-42303
Modified: branches/bmesh/blender/source/blender/editors/space_text/text_draw.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_text/text_draw.c
2011-11-30 22:23:40 UTC (rev 42303)
+++ branches/bmesh/blender/source/blender/editors/space_text/text_draw.c
2011-12-01 00:34:59 UTC (rev 42304)
@@ -1689,6 +1689,9 @@
int i, x, y, winx, linecount= 0, lineno= 0;
int wraplinecount= 0, wrap_skip= 0;
+ if(st->lheight) st->viewlines= (int)ar->winy/st->lheight;
+ else st->viewlines= 0;
+
/* if no text, nothing to do */
if(!text)
return;
@@ -1699,9 +1702,6 @@
if(!text->curl || !text->sell || !text->lines.first ||
!text->lines.last)
txt_clean_text(text);
- if(st->lheight) st->viewlines= (int)ar->winy/st->lheight;
- else st->viewlines= 0;
-
/* update rects for scroll */
calc_text_rcts(st, ar, &scroll, &back); /* scroll will hold the entire
bar size */
Modified: branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
===================================================================
--- branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
2011-11-30 22:23:40 UTC (rev 42303)
+++ branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
2011-12-01 00:34:59 UTC (rev 42304)
@@ -492,7 +492,7 @@
#define MTEX_5TAP_BUMP 512
#define MTEX_BUMP_OBJECTSPACE 1024
#define MTEX_BUMP_TEXTURESPACE 2048
-#define MTEX_BUMP_FLIPPED 4096 /* temp flag for 2.59/2.60 */
+/* #define MTEX_BUMP_FLIPPED 4096 */ /* UNUSED */
/* blendtype */
#define MTEX_BLEND 0
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
