Revision: 23456
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23456
Author: ben2610
Date: 2009-09-24 16:39:14 +0200 (Thu, 24 Sep 2009)
Log Message:
-----------
svn merge -r 23448:23455
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/itasc/source/blender/blenlib/BLI_winstuff.h
branches/itasc/source/blender/blenloader/intern/readfile.c
branches/itasc/source/blender/editors/space_console/space_console.c
branches/itasc/source/blender/render/intern/source/texture.c
Modified: branches/itasc/source/blender/blenlib/BLI_winstuff.h
===================================================================
--- branches/itasc/source/blender/blenlib/BLI_winstuff.h 2009-09-24
14:33:05 UTC (rev 23455)
+++ branches/itasc/source/blender/blenlib/BLI_winstuff.h 2009-09-24
14:39:14 UTC (rev 23456)
@@ -28,7 +28,10 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
+
+#ifndef FREE_WINDOWS
#pragma warning(once: 4761 4305 4244 4018)
+#endif
#define WIN32_LEAN_AND_MEAN
Modified: branches/itasc/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/itasc/source/blender/blenloader/intern/readfile.c 2009-09-24
14:33:05 UTC (rev 23455)
+++ branches/itasc/source/blender/blenloader/intern/readfile.c 2009-09-24
14:39:14 UTC (rev 23456)
@@ -9377,7 +9377,7 @@
strcpy(sce->nodetree->id.name, "NTComposit
Nodetree");
/* move to cameras */
- if(sce->r.scemode & R_PANORAMA) {
+ if(sce->r.mode & R_PANORAMA) {
for(base=sce->base.first; base;
base=base->next) {
ob= newlibadr(fd, lib, base->object);
@@ -9387,7 +9387,7 @@
}
}
- sce->r.scemode &= ~R_PANORAMA;
+ sce->r.mode &= ~R_PANORAMA;
}
}
/* and texture trees */
Modified: branches/itasc/source/blender/editors/space_console/space_console.c
===================================================================
--- branches/itasc/source/blender/editors/space_console/space_console.c
2009-09-24 14:33:05 UTC (rev 23455)
+++ branches/itasc/source/blender/editors/space_console/space_console.c
2009-09-24 14:39:14 UTC (rev 23456)
@@ -174,6 +174,9 @@
console_scrollback_add_str(C, "Autocomplete: Ctrl+Space",
0);
console_scrollback_add_str(C, "Ctrl +/- Wheel: Zoom", 0);
console_scrollback_add_str(C, "Builtin Modules: bpy, bpy.data,
bpy.ops, bpy.props, bpy.types, bpy.ui", 0);
+
+ /* This is normally set by python but to start with its easier
just to set it like this rather then running python with no args */
+ strcpy(sc->prompt, ">>> ");
}
/* clear and setup matrix */
Modified: branches/itasc/source/blender/render/intern/source/texture.c
===================================================================
--- branches/itasc/source/blender/render/intern/source/texture.c
2009-09-24 14:33:05 UTC (rev 23455)
+++ branches/itasc/source/blender/render/intern/source/texture.c
2009-09-24 14:39:14 UTC (rev 23456)
@@ -1631,7 +1631,7 @@
float fact, facm, factt, facmm, stencilTin=1.0;
float texvec[3], dxt[3], dyt[3], tempvec[3], norvec[3],
warpvec[3]={0.0f, 0.0f, 0.0f}, Tnor=1.0;
int tex_nr, rgbnor= 0, warpdone=0;
- float nu[3], nv[3], nn[3] = {0,0,0}, dudnu = 1.f, dudnv = 0.f, dvdnu =
0.f, dvdnv = 1.f; // bump mapping
+ float nu[3] = {0,0,0}, nv[3] = {0,0,0}, nn[3] = {0,0,0}, dudnu = 1.f,
dudnv = 0.f, dvdnu = 0.f, dvdnv = 1.f; // bump mapping
int nunvdone= 0;
if (R.r.scemode & R_NO_TEX) return;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
