Revision: 15074
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15074
Author: genscher
Date: 2008-05-31 23:23:57 +0200 (Sat, 31 May 2008)
Log Message:
-----------
Merging revisions 15020-15073 of
https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/cloth/blender/config/win32-vc-config.py
branches/cloth/blender/release/windows/installer/00.sconsblender.nsi
branches/cloth/blender/source/blender/blenkernel/intern/object.c
branches/cloth/blender/source/blender/blenlib/intern/util.c
branches/cloth/blender/source/blender/include/BIF_editseq.h
branches/cloth/blender/source/blender/include/transform.h
branches/cloth/blender/source/blender/makesdna/intern/makesdna.c
branches/cloth/blender/source/blender/python/api2_2x/Draw.c
branches/cloth/blender/source/blender/python/api2_2x/Node.c
branches/cloth/blender/source/blender/python/api2_2x/Scene.c
branches/cloth/blender/source/blender/python/api2_2x/sceneRender.c
branches/cloth/blender/source/blender/render/extern/include/RE_raytrace.h
branches/cloth/blender/source/blender/render/intern/source/pipeline.c
branches/cloth/blender/source/blender/render/intern/source/rayshade.c
branches/cloth/blender/source/blender/src/drawobject.c
branches/cloth/blender/source/blender/src/drawseq.c
branches/cloth/blender/source/blender/src/drawview.c
branches/cloth/blender/source/blender/src/editarmature.c
branches/cloth/blender/source/blender/src/editseq.c
branches/cloth/blender/source/blender/src/filesel.c
branches/cloth/blender/source/blender/src/fluidsim.c
branches/cloth/blender/source/blender/src/meshtools.c
branches/cloth/blender/source/blender/src/transform_conversions.c
branches/cloth/blender/source/blender/src/transform_manipulator.c
branches/cloth/blender/source/blender/src/transform_orientations.c
branches/cloth/blender/source/blender/src/view.c
Modified: branches/cloth/blender/config/win32-vc-config.py
===================================================================
--- branches/cloth/blender/config/win32-vc-config.py 2008-05-31 19:08:12 UTC
(rev 15073)
+++ branches/cloth/blender/config/win32-vc-config.py 2008-05-31 21:23:57 UTC
(rev 15074)
@@ -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/cloth/blender/release/windows/installer/00.sconsblender.nsi
===================================================================
--- branches/cloth/blender/release/windows/installer/00.sconsblender.nsi
2008-05-31 19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/release/windows/installer/00.sconsblender.nsi
2008-05-31 21:23:57 UTC (rev 15074)
@@ -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/cloth/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/object.c
2008-05-31 19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/source/blender/blenkernel/intern/object.c
2008-05-31 21:23:57 UTC (rev 15074)
@@ -1614,7 +1614,7 @@
for(eve= em->verts.first; eve; eve= eve->next) {
if(eve->keyindex==nr) {
- memcpy(vec, eve->co, 12);
+ memcpy(vec, eve->co, sizeof(float)*3);
break;
}
}
@@ -1652,18 +1652,20 @@
Curve *cu;
BPoint *bp;
BezTriple *bezt;
+ int found= 0;
cu= par->data;
nu= cu->nurb.first;
if(par==G.obedit) nu= editNurb.first;
count= 0;
- while(nu) {
+ while(nu && !found) {
if((nu->type & 7)==CU_BEZIER) {
bezt= nu->bezt;
a= nu->pntsu;
while(a--) {
if(count==nr) {
+ found= 1;
VECCOPY(vec, bezt->vec[1]);
break;
}
@@ -1676,7 +1678,8 @@
a= nu->pntsu*nu->pntsv;
while(a--) {
if(count==nr) {
- memcpy(vec, bp->vec, 12);
+ found= 1;
+ memcpy(vec, bp->vec,
sizeof(float)*3);
break;
}
count++;
Modified: branches/cloth/blender/source/blender/blenlib/intern/util.c
===================================================================
--- branches/cloth/blender/source/blender/blenlib/intern/util.c 2008-05-31
19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/source/blender/blenlib/intern/util.c 2008-05-31
21:23:57 UTC (rev 15074)
@@ -1166,6 +1166,7 @@
MEM_freeN(filepart);
}
+ BLI_cleanup_file(NULL, tmp);
strcpy(path, tmp);
#ifdef WIN32
Modified: branches/cloth/blender/source/blender/include/BIF_editseq.h
===================================================================
--- branches/cloth/blender/source/blender/include/BIF_editseq.h 2008-05-31
19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/source/blender/include/BIF_editseq.h 2008-05-31
21:23:57 UTC (rev 15074)
@@ -92,8 +92,8 @@
int seq_tx_get_start(struct Sequence *seq);
int seq_tx_get_end(struct Sequence *seq);
-int seq_tx_get_final_left(struct Sequence *seq);
-int seq_tx_get_final_right(struct Sequence *seq);
+int seq_tx_get_final_left(struct Sequence *seq, int metaclip);
+int seq_tx_get_final_right(struct Sequence *seq, int metaclip);
void seq_tx_set_final_left(struct Sequence *seq, int i);
void seq_tx_set_final_right(struct Sequence *seq, int i);
Modified: branches/cloth/blender/source/blender/include/transform.h
===================================================================
--- branches/cloth/blender/source/blender/include/transform.h 2008-05-31
19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/source/blender/include/transform.h 2008-05-31
21:23:57 UTC (rev 15074)
@@ -515,6 +515,7 @@
int manageObjectSpace(int confirm, int set);
int manageMeshSpace(int confirm, int set);
+int manageBoneSpace(int confirm, int set);
/* Those two fill in mat and return non-zero on success */
int createSpaceNormal(float mat[3][3], float normal[3]);
Modified: branches/cloth/blender/source/blender/makesdna/intern/makesdna.c
===================================================================
--- branches/cloth/blender/source/blender/makesdna/intern/makesdna.c
2008-05-31 19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/source/blender/makesdna/intern/makesdna.c
2008-05-31 21:23:57 UTC (rev 15074)
@@ -688,18 +688,18 @@
/* 4-8 aligned/ */
if(sizeof(void *) == 4) {
if (len % 4) {
- printf("Align
pointer error in struct: %s %s\n", types[structtype], cp);
+ printf("Align
pointer error in struct (len4): %s %s\n", types[structtype], cp);
dna_error = 1;
}
} else {
if (len % 8) {
- printf("Align
pointer error in struct: %s %s\n", types[structtype], cp);
+ printf("Align
pointer error in struct (len8): %s %s\n", types[structtype], cp);
dna_error = 1;
}
}
if (alphalen % 8) {
- printf("Align pointer
error in struct: %s %s\n", types[structtype],cp);
+ printf("Align pointer
error in struct (alphalen8): %s %s\n", types[structtype],cp);
dna_error = 1;
}
@@ -748,13 +748,13 @@
// has_pointer is set or alphalen != len
if (has_pointer || alphalen != len) {
if (alphalen % 8) {
- printf("Sizeerror in
struct: %s (add %d bytes)\n", types[structtype], alphalen%8);
+ printf("Sizeerror 8 in
struct: %s (add %d bytes)\n", types[structtype], alphalen%8);
dna_error = 1;
}
}
if(len % 4) {
- printf("Sizeerror in struct: %s
(add %d bytes)\n", types[structtype], len%4);
+ printf("Sizeerror 4 in struct:
%s (add %d bytes)\n", types[structtype], len%4);
dna_error = 1;
}
Modified: branches/cloth/blender/source/blender/python/api2_2x/Draw.c
===================================================================
--- branches/cloth/blender/source/blender/python/api2_2x/Draw.c 2008-05-31
19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/source/blender/python/api2_2x/Draw.c 2008-05-31
21:23:57 UTC (rev 15074)
@@ -613,6 +613,8 @@
PyErr_Print( );
script->flags = 0; /* mark script struct for deletion */
SCRIPT_SET_NULL(script);
+ script->scriptname[0] = '\0';
+ script->scriptarg[0] = '\0';
error_pyscript();
scrarea_queue_redraw( sc->area );
}
Modified: branches/cloth/blender/source/blender/python/api2_2x/Node.c
===================================================================
--- branches/cloth/blender/source/blender/python/api2_2x/Node.c 2008-05-31
19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/source/blender/python/api2_2x/Node.c 2008-05-31
21:23:57 UTC (rev 15074)
@@ -848,7 +848,7 @@
if (PyInt_Check(pyidx)) {
idx = (int)PyInt_AsLong(pyidx);
- if (idx < 0 || idx >= Sockinmap_len(self))
+ if (idx < 0 || idx >= Sockoutmap_len(self))
return EXPP_ReturnIntError(PyExc_IndexError, "index out
of range");
}
else if (PyString_Check(pyidx)) {
Modified: branches/cloth/blender/source/blender/python/api2_2x/Scene.c
===================================================================
--- branches/cloth/blender/source/blender/python/api2_2x/Scene.c
2008-05-31 19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/source/blender/python/api2_2x/Scene.c
2008-05-31 21:23:57 UTC (rev 15074)
@@ -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/cloth/blender/source/blender/python/api2_2x/sceneRender.c
===================================================================
--- branches/cloth/blender/source/blender/python/api2_2x/sceneRender.c
2008-05-31 19:08:12 UTC (rev 15073)
+++ branches/cloth/blender/source/blender/python/api2_2x/sceneRender.c
2008-05-31 21:23:57 UTC (rev 15074)
@@ -478,10 +478,12 @@
}
else { /* background mode (blender -b file.blend -P script) */
- Render *re= RE_NewRender("Render");
+ Render *re= RE_NewRender(G.scene->id.name);
- int end_frame = G.scene->r.efra; /* is of type short currently
*/
+
+ int end_frame = G.scene->r.efra;
+
if (G.scene != self->scene)
return EXPP_ReturnPyObjError (PyExc_RuntimeError,
"scene to render in bg mode must be the active
scene");
@@ -490,7 +492,7 @@
RE_BlenderAnim(re, G.scene, G.scene->r.sfra, G.scene->r.efra);
- G.scene->r.efra = (short)end_frame;
+ G.scene->r.efra = end_frame;
}
Py_RETURN_NONE;
@@ -571,7 +573,7 @@
set_scene( oldsce );
}
else { /* background mode (blender -b file.blend -P script) */
- Render *re= RE_NewRender("Render");
+ Render *re= RE_NewRender(G.scene->id.name);
if (G.scene != self->scene)
return EXPP_ReturnPyObjError (PyExc_RuntimeError,
Modified:
branches/cloth/blender/source/blender/render/extern/include/RE_raytrace.h
===================================================================
--- branches/cloth/blender/source/blender/render/extern/include/RE_raytrace.h
2008-05-31 19:08:12 UTC (rev 15073)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
