Revision: 15060
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15060
Author: bdiego
Date: 2008-05-30 19:52:08 +0200 (Fri, 30 May 2008)
Log Message:
-----------
branches/blender-2.47
Merge from trunk:
Revision: 15050
Revision: 15051
Revision: 15055
Revision: 15056
Modified Paths:
--------------
branches/blender-2.47/config/win32-vc-config.py
branches/blender-2.47/release/windows/installer/00.sconsblender.nsi
branches/blender-2.47/source/blender/blenlib/intern/util.c
branches/blender-2.47/source/blender/python/api2_2x/Scene.c
branches/blender-2.47/source/blender/src/transform_conversions.c
branches/blender-2.47/source/blender/src/transform_orientations.c
branches/blender-2.47/source/blender/src/view.c
Modified: branches/blender-2.47/config/win32-vc-config.py
===================================================================
--- branches/blender-2.47/config/win32-vc-config.py 2008-05-30 17:42:02 UTC
(rev 15059)
+++ branches/blender-2.47/config/win32-vc-config.py 2008-05-30 17:52:08 UTC
(rev 15060)
@@ -157,7 +157,7 @@
C_WARN = []
CC_WARN = []
-LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shell32
ole32 oleaut32 uuid'
+LLIBS = 'ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder
shell32 ole32 oleaut32 uuid'
PLATFORM_LINKFLAGS = '''
/SUBSYSTEM:CONSOLE
Modified: branches/blender-2.47/release/windows/installer/00.sconsblender.nsi
===================================================================
--- branches/blender-2.47/release/windows/installer/00.sconsblender.nsi
2008-05-30 17:42:02 UTC (rev 15059)
+++ branches/blender-2.47/release/windows/installer/00.sconsblender.nsi
2008-05-30 17:52:08 UTC (rev 15060)
@@ -32,7 +32,7 @@
!insertmacro MUI_PAGE_DIRECTORY
Page custom DataLocation DataLocationOnLeave
-Page custom AppDataChoice AppDataChoiceOnLeave
+;Page custom AppDataChoice AppDataChoiceOnLeave
Page custom PreMigrateUserSettings MigrateUserSettings
!insertmacro MUI_PAGE_INSTFILES
!insertmacro MUI_PAGE_FINISH
@@ -271,7 +271,9 @@
StrCpy $SETUSERCONTEXT "false"
${NSD_GetState} $HWND_APPDATA $R0
${If} $R0 == "1"
- StrCpy $SETUSERCONTEXT "true"
+ ; FIXME: disabled 'all users' until fully multi-user compatible
+ ;StrCpy $SETUSERCONTEXT "true"
+ Call SetWinXPPathCurrentUser
${Else}
${NSD_GetState} $HWND_INSTDIR $R0
${If} $R0 == "1"
Modified: branches/blender-2.47/source/blender/blenlib/intern/util.c
===================================================================
--- branches/blender-2.47/source/blender/blenlib/intern/util.c 2008-05-30
17:42:02 UTC (rev 15059)
+++ branches/blender-2.47/source/blender/blenlib/intern/util.c 2008-05-30
17:52:08 UTC (rev 15060)
@@ -1166,6 +1166,7 @@
MEM_freeN(filepart);
}
+ BLI_cleanup_file(NULL, tmp);
strcpy(path, tmp);
#ifdef WIN32
Modified: branches/blender-2.47/source/blender/python/api2_2x/Scene.c
===================================================================
--- branches/blender-2.47/source/blender/python/api2_2x/Scene.c 2008-05-30
17:42:02 UTC (rev 15059)
+++ branches/blender-2.47/source/blender/python/api2_2x/Scene.c 2008-05-30
17:52:08 UTC (rev 15060)
@@ -1355,16 +1355,29 @@
for (base= scene->base.first; base && i!=index; base=
base->next, index++) {}
/* selected */
else if (self->mode==EXPP_OBSEQ_SELECTED) {
- for (base= scene->base.first; base && i!=index; base=
base->next)
- if (base->flag & SELECT)
- index++;
+ for (base= scene->base.first; base; base= base->next) {
+ if (base->flag & SELECT) {
+ if (i==index) {
+ break;
+ } else {
+ index++;
+ }
+ }
+ }
}
/* context */
else if (self->mode==EXPP_OBSEQ_CONTEXT) {
- if (G.vd)
- for (base= scene->base.first; base && i!=index; base=
base->next)
- if TESTBASE(base)
- index++;
+ if (G.vd) {
+ for (base= scene->base.first; base; base= base->next) {
+ if (TESTBASE(base)) {
+ if (i==index) {
+ break;
+ } else {
+ index++;
+ }
+ }
+ }
+ }
}
if (!(base))
Modified: branches/blender-2.47/source/blender/src/transform_conversions.c
===================================================================
--- branches/blender-2.47/source/blender/src/transform_conversions.c
2008-05-30 17:42:02 UTC (rev 15059)
+++ branches/blender-2.47/source/blender/src/transform_conversions.c
2008-05-30 17:52:08 UTC (rev 15060)
@@ -1365,7 +1365,7 @@
tail++;
}
if( propmode ||
- ((bezt->f1 & SELECT) &&
(G.f & G_HIDDENHANDLES)) ||
+ ((bezt->f2 & SELECT) &&
(G.f & G_HIDDENHANDLES)) ||
((bezt->f3 & SELECT) &&
(G.f & G_HIDDENHANDLES)==0)
) {
VECCOPY(td->iloc, bezt->vec[2]);
Modified: branches/blender-2.47/source/blender/src/transform_orientations.c
===================================================================
--- branches/blender-2.47/source/blender/src/transform_orientations.c
2008-05-30 17:42:02 UTC (rev 15059)
+++ branches/blender-2.47/source/blender/src/transform_orientations.c
2008-05-30 17:52:08 UTC (rev 15060)
@@ -373,6 +373,14 @@
if(G.obedit)
{
+ float imat[3][3], mat[3][3];
+
+ /* we need the transpose of the inverse for a normal... */
+ Mat3CpyMat4(imat, ob->obmat);
+
+ Mat3Inv(mat, imat);
+ Mat3Transp(mat);
+
ob= G.obedit;
if(G.obedit->type==OB_MESH)
@@ -606,8 +614,17 @@
}
}
- Mat4Mul3Vecfl(G.obedit->obmat, plane);
- Mat4Mul3Vecfl(G.obedit->obmat, normal);
+ /* Vectors from edges don't need the special transpose inverse
multiplication */
+ if (result == ORIENTATION_EDGE)
+ {
+ Mat4Mul3Vecfl(ob->obmat, normal);
+ Mat4Mul3Vecfl(ob->obmat, plane);
+ }
+ else
+ {
+ Mat3MulVecfl(mat, normal);
+ Mat3MulVecfl(mat, plane);
+ }
}
else if(ob && (ob->flag & OB_POSEMODE))
{
Modified: branches/blender-2.47/source/blender/src/view.c
===================================================================
--- branches/blender-2.47/source/blender/src/view.c 2008-05-30 17:42:02 UTC
(rev 15059)
+++ branches/blender-2.47/source/blender/src/view.c 2008-05-30 17:52:08 UTC
(rev 15060)
@@ -1448,6 +1448,8 @@
float bmat[4][4];
float tmat[3][3];
+ G.vd->view= 0; /* dont show the grid */
+
Mat4CpyMat4(bmat, ob->obmat);
Mat4Ortho(bmat);
Mat4Invert(G.vd->viewmat, bmat);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
