[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14390] trunk/blender/source: simple fix for "Unable to make version backup" warning when saving files.
Revision: 14390
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14390
Author: campbellbarton
Date: 2008-04-12 12:55:10 +0200 (Sat, 12 Apr 2008)
Log Message:
---
simple fix for "Unable to make version backup" warning when saving files.
missing a return.
For *nix sustems, recent physics pointcache refactor uses stdio.h's remove()
rather then system("rm -f ...") for removing files, since it was a lot slower
for removing pointcache.
Ton used the system command because there was some problem using remove()
~6years back, but he cant remember why, (maybe its not a problem now)
Simple error, remove wasn't returning a value, but keep an eye out for problems
removing files, and if anyone can reproduce the "Unable to make version backup"
problem when saving, we should look into it.
Also added a note about using # in the output path for blenders command line
help text.
Modified Paths:
--
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===
--- trunk/blender/source/blender/blenlib/intern/fileops.c 2008-04-11
21:19:00 UTC (rev 14389)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c 2008-04-12
10:55:10 UTC (rev 14390)
@@ -339,7 +339,9 @@
sprintf(str, "/bin/rmdir \"%s\"", file);
return system(str);
}
- else remove(file); //sprintf(str, "/bin/rm -f \"%s\"", file);
+ else {
+ return remove(file); //sprintf(str, "/bin/rm -f
\"%s\"", file);
+ }
}
return -1;
}
Modified: trunk/blender/source/creator/creator.c
===
--- trunk/blender/source/creator/creator.c 2008-04-11 21:19:00 UTC (rev
14389)
+++ trunk/blender/source/creator/creator.c 2008-04-12 10:55:10 UTC (rev
14390)
@@ -185,6 +185,10 @@
printf ("-o \tSet the render path and file name.\n");
printf (" Use // at the start of the path to\n");
printf ("render relative to the blend file.\n");
+ printf (" The # characters are replaced by the frame number, and
used to define zero padding.\n");
+ printf ("ani_##_test.png becomes ani_01_test.png\n");
+ printf ("test-##.png becomes test-01.png\n");
+ printf ("When the filename has no #, The suffix is added
to the filename\n");
printf (" The frame number will be added at the end of the
filename.\n");
printf (" eg: blender -b foobar.blend -o //render_ -F PNG -x 1
-a\n");
printf ("\nFormat options:\n");
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14391] trunk/blender/source/blender/ blenkernel/intern/pointcache.c:
Revision: 14391
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14391
Author: blendix
Date: 2008-04-12 14:56:49 +0200 (Sat, 12 Apr 2008)
Log Message:
---
Fix for bug #8930: issue removing temporary pointcache directory on windows.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/pointcache.c
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2008-04-12
10:55:10 UTC (rev 14390)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2008-04-12
12:56:49 UTC (rev 14391)
@@ -187,14 +187,17 @@
if (i > 6)
file[i-6] = '\0';
- sprintf(filename, "//"PTCACHE_PATH"%s/", file); /* add blend
file name to pointcache dir */
+ sprintf(filename, "//"PTCACHE_PATH"%s", file); /* add blend
file name to pointcache dir */
+ BLI_add_slash(filename);
BLI_convertstringcode(filename, blendfilename, 0);
return strlen(filename);
}
/* use the temp path. this is weak but better then not using point
cache at all */
/* btempdir is assumed to exist and ALWAYS has a trailing slash */
- return sprintf(filename, "%s"PTCACHE_PATH"%d/", btempdir,
abs(getpid()));
+ sprintf(filename, "%s"PTCACHE_PATH"%d", btempdir, abs(getpid()));
+ BLI_add_slash(filename);
+ return strlen(filename);
}
static int BKE_ptcache_id_filename(PTCacheID *pid, char *filename, int cfra,
short do_path, short do_ext)
@@ -497,13 +500,12 @@
ptcache_path(NULL, path);
- if (BLI_exists(path)) {
- /* TODO, Check with win32, probably needs last slash removed */
+ if (BLI_exist(path)) {
/* The pointcache dir exists? - remove all pointcache */
DIR *dir;
struct dirent *de;
-
+
dir = opendir(path);
if (dir==NULL)
return;
@@ -518,6 +520,8 @@
rmdir = 0; /* unknown file, dont remove the dir
*/
}
}
+
+ closedir(dir);
} else {
rmdir = 0; /* path dosnt exist */
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14392] trunk/blender/source/blender/ blenloader/intern/readfile.c:
Revision: 14392
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14392
Author: blendix
Date: 2008-04-12 15:00:01 +0200 (Sat, 12 Apr 2008)
Log Message:
---
Fix for bug #8932: crash converting old particle system.
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2008-04-12
12:56:49 UTC (rev 14391)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2008-04-12
13:00:01 UTC (rev 14392)
@@ -7367,6 +7367,7 @@
/* create new particle system */
psys = MEM_callocN(sizeof(ParticleSystem),
"particle_system");
+ psys->pointcache = BKE_ptcache_add();
part = psys->part = psys_new_settings("PSys",
main);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14393] trunk/blender/source/blender/ quicktime/apple/quicktime_export.c:
Revision: 14393
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14393
Author: blendix
Date: 2008-04-12 15:49:00 +0200 (Sat, 12 Apr 2008)
Log Message:
---
Fix for bug #5862: crash rendering to quicktime h.264. This would need
an upgrade to the new quicktime api to work, but that's not really
compatible with rendering out frames sequentially. For now it sets the
compression to minimum quality, which doesn't need seeking forward and
backwards.
Modified Paths:
--
trunk/blender/source/blender/quicktime/apple/quicktime_export.c
Modified: trunk/blender/source/blender/quicktime/apple/quicktime_export.c
===
--- trunk/blender/source/blender/quicktime/apple/quicktime_export.c
2008-04-12 13:00:01 UTC (rev 14392)
+++ trunk/blender/source/blender/quicktime/apple/quicktime_export.c
2008-04-12 13:49:00 UTC (rev 14393)
@@ -311,6 +311,7 @@
static void QT_StartAddVideoSamplesToMedia (const Rect *trackFrame, int rectx,
int recty)
{
+ SCTemporalSettings gTemporalSettings;
OSErr err = noErr;
qtexport->ibuf = IMB_allocImBuf (rectx, recty, 32, IB_rect, 0);
@@ -329,7 +330,18 @@
SCDefaultPixMapSettings (qtdata->theComponent, qtexport->thePixMap,
true);
- SCSetInfo(qtdata->theComponent, scTemporalSettingsType,
&qtdata->gTemporalSettings);
+ // workaround for crash with H.264, which requires an upgrade to
+ // the new callback based api for proper encoding, but that's not
+ // really compatible with rendering out frames sequentially
+ gTemporalSettings = qtdata->gTemporalSettings;
+ if(qtdata->gSpatialSettings.codecType == kH264CodecType) {
+ if(gTemporalSettings.temporalQuality != codecMinQuality) {
+ fprintf(stderr, "Only minimum quality compression
supported for QuickTime H.264.\n");
+ gTemporalSettings.temporalQuality = codecMinQuality;
+ }
+ }
+
+ SCSetInfo(qtdata->theComponent, scTemporalSettingsType,
&gTemporalSettings);
SCSetInfo(qtdata->theComponent, scSpatialSettingsType,
&qtdata->gSpatialSettings);
SCSetInfo(qtdata->theComponent, scDataRateSettingsType,
&qtdata->aDataRateSetting);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14394] trunk/blender/source/blender/ blenkernel/intern:
Revision: 14394
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14394
Author: blendix
Date: 2008-04-12 16:30:17 +0200 (Sat, 12 Apr 2008)
Log Message:
---
Fix for bug #6753: metaballs instanced by a particle system did not
refresh properly, also fixed a memory leak.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/depsgraph.c
trunk/blender/source/blender/blenkernel/intern/scene.c
Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2008-04-12
13:49:00 UTC (rev 14393)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c 2008-04-12
14:30:17 UTC (rev 14394)
@@ -610,6 +610,8 @@
if(part->draw_as == PART_DRAW_OB && part->dup_ob) {
node2 = dag_get_node(dag, part->dup_ob);
dag_add_relation(dag, node, node2,
DAG_RL_OB_OB);
+ if(part->dup_ob->type == OB_MBALL)
+ dag_add_relation(dag, node, node2,
DAG_RL_DATA_DATA);
}
if(part->draw_as == PART_DRAW_GR && part->dup_group) {
Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===
--- trunk/blender/source/blender/blenkernel/intern/scene.c 2008-04-12
13:49:00 UTC (rev 14393)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c 2008-04-12
14:30:17 UTC (rev 14394)
@@ -426,6 +426,9 @@
duplilist=
object_duplilist(G.scene, (*base)->object);
dupob= duplilist->first;
+
+ if(!dupob)
+
free_object_duplilist(duplilist);
}
}
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14395] trunk/blender/source/blender/src/ buttons_editing.c:
Revision: 14395
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14395
Author: blendix
Date: 2008-04-12 16:53:29 +0200 (Sat, 12 Apr 2008)
Log Message:
---
Fix for bug #8934: parenting or connecting armature bones didn't really
sync tip and root selection intuitively.
Modified Paths:
--
trunk/blender/source/blender/src/buttons_editing.c
Modified: trunk/blender/source/blender/src/buttons_editing.c
===
--- trunk/blender/source/blender/src/buttons_editing.c 2008-04-12 14:30:17 UTC
(rev 14394)
+++ trunk/blender/source/blender/src/buttons_editing.c 2008-04-12 14:53:29 UTC
(rev 14395)
@@ -4001,15 +4001,26 @@
{
EditBone *ebone= bonev;
- if (ebone->parent && (ebone->flag & BONE_CONNECTED)) {
- /* Attach this bone to its parent */
- VECCOPY(ebone->head, ebone->parent->tail);
+ if (ebone->parent) {
+ if(ebone->flag & BONE_CONNECTED) {
+ /* Attach this bone to its parent */
+ VECCOPY(ebone->head, ebone->parent->tail);
+
+ if(ebone->flag & BONE_ROOTSEL)
+ ebone->parent->flag |= BONE_TIPSEL;
+ }
+ else if(!(ebone->parent->flag & BONE_ROOTSEL)) {
+ ebone->parent->flag &= ~BONE_TIPSEL;
+ }
}
}
static void parnr_to_editbone(EditBone *bone)
{
if (bone->parNr == -1){
+ if(bone->parent && !(bone->parent->flag & BONE_ROOTSEL))
+ bone->parent->flag &= ~BONE_TIPSEL;
+
bone->parent = NULL;
bone->flag &= ~BONE_CONNECTED;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14396] trunk/blender/source/blender: removed blenders backup feature.
Revision: 14396
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14396
Author: campbellbarton
Date: 2008-04-12 17:03:47 +0200 (Sat, 12 Apr 2008)
Log Message:
---
removed blenders backup feature.
sprintf(str, "/bin/su root -c 'cd %s; /bin/tar cf - \"%s\" | (/bin/cd %s;
/bin/tar xf -)'", from, file, to);
return system(str);
This would ask for a password in blenders terminal, in ubuntu there is no root
user...
If this feature is added back it should be written in a much nicer way.
Also made HKey toggle hidden files in the file selector.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/packedFile.c
trunk/blender/source/blender/blenlib/BLI_blenlib.h
trunk/blender/source/blender/blenlib/intern/fileops.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/src/filesel.c
Modified: trunk/blender/source/blender/blenkernel/intern/packedFile.c
===
--- trunk/blender/source/blender/blenkernel/intern/packedFile.c 2008-04-12
14:53:29 UTC (rev 14395)
+++ trunk/blender/source/blender/blenkernel/intern/packedFile.c 2008-04-12
15:03:47 UTC (rev 14396)
@@ -320,11 +320,11 @@
if (remove_tmp) {
if (ret_value == RET_ERROR) {
- if (BLI_rename(tempname, name) == RET_ERROR) {
+ if (BLI_rename(tempname, name) != 0) {
if(guimode) error("Error restoring tempfile.
Check files: '%s' '%s'", tempname, name);
}
} else {
- if (BLI_delete(tempname, 0, 0) == RET_ERROR) {
+ if (BLI_delete(tempname, 0, 0) != 0) {
if(guimode) error("Error deleting '%s'
(ignored)");
}
}
Modified: trunk/blender/source/blender/blenlib/BLI_blenlib.h
===
--- trunk/blender/source/blender/blenlib/BLI_blenlib.h 2008-04-12 14:53:29 UTC
(rev 14395)
+++ trunk/blender/source/blender/blenlib/BLI_blenlib.h 2008-04-12 15:03:47 UTC
(rev 14396)
@@ -299,7 +299,6 @@
/* BLI_fileops.h */
void BLI_recurdir_fileops(char *dirname);
int BLI_link(char *file, char *to);
-int BLI_backup(char *file, char *from, char *to);
int BLI_is_writable(char *filename);
/**
Modified: trunk/blender/source/blender/blenlib/intern/fileops.c
===
--- trunk/blender/source/blender/blenlib/intern/fileops.c 2008-04-12
14:53:29 UTC (rev 14395)
+++ trunk/blender/source/blender/blenlib/intern/fileops.c 2008-04-12
15:03:47 UTC (rev 14396)
@@ -267,12 +267,6 @@
return 1;
}
-int BLI_backup(char *file, char *from, char *to) {
- callLocalErrorCallBack("Backing up files is unsupported on Windows");
-
- return 1;
-}
-
int BLI_exists(char *file) {
return (GetFileAttributes(file) != 0x);
}
@@ -364,12 +358,6 @@
return system(str);
}
-int BLI_backup(char *file, char *from, char *to) {
- sprintf(str, "/bin/su root -c 'cd %s; /bin/tar cf - \"%s\" | (/bin/cd
%s; /bin/tar xf -)'", from, file, to);
-
- return system(str);
-}
-
int BLI_exists(char *file) {
return BLI_exist(file);
}
Modified: trunk/blender/source/blender/blenloader/intern/writefile.c
===
--- trunk/blender/source/blender/blenloader/intern/writefile.c 2008-04-12
14:53:29 UTC (rev 14395)
+++ trunk/blender/source/blender/blenloader/intern/writefile.c 2008-04-12
15:03:47 UTC (rev 14396)
@@ -2092,7 +2092,7 @@
}
}
else
- if(BLI_rename(tempname, dir) < 0) {
+ if(BLI_rename(tempname, dir) != 0) {
*error_r= "Can't change old file. File saved with @";
return 0;
}
Modified: trunk/blender/source/blender/src/filesel.c
===
--- trunk/blender/source/blender/src/filesel.c 2008-04-12 14:53:29 UTC (rev
14395)
+++ trunk/blender/source/blender/src/filesel.c 2008-04-12 15:03:47 UTC (rev
14396)
@@ -2013,8 +2013,7 @@
if (sfile->filelist[i].flags & ACTIVE) {
BLI_make_file_string(G.sce, str,
sfile->dir, sfile->filelist[i].relname);
- if(event==BKEY) ret=
BLI_backup(sfile->filelist[i].relname, sfile->dir, otherdir);
- else if(event==CKEY) ret=
BLI_copy_fileops(str, otherdir);
+ if(event==CKEY) ret=
BLI_copy_fileops(str, otherdir);
else if(eve
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14398] trunk/blender/source/blender/src/ renderwin.c:
Revision: 14398 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14398 Author: blendix Date: 2008-04-12 19:34:48 +0200 (Sat, 12 Apr 2008) Log Message: --- Fix for bug #7100: when rendering on solaris, pressing esc could kill the process. Some time ago SIGVTALRM was replaced with SIGALRM to solve issues on linux, but this signal can kill the process on solaris, so now it uses SIGVTALRM again there. Modified Paths: -- trunk/blender/source/blender/src/renderwin.c Modified: trunk/blender/source/blender/src/renderwin.c === --- trunk/blender/source/blender/src/renderwin.c2008-04-12 16:31:29 UTC (rev 14397) +++ trunk/blender/source/blender/src/renderwin.c2008-04-12 17:34:48 UTC (rev 14398) @@ -1018,7 +1018,7 @@ } #else -/* all other OS's support signal(SIGVTALRM) */ +/* all other OS's support signal(SIGVTALRM/SIGALRM) */ /* XXX The ESC problem: some unix users reported that ESC doesn't cancel * renders anymore. Most complaints came from linux, but it's not @@ -1029,7 +1029,10 @@ * fixes the problem, at least while we investigate better. * * ITIMER_REAL (SIGALRM): timer that counts real system time - * ITIMER_VIRTUAL (SIGVTALRM): only counts time spent in its owner process */ + * ITIMER_VIRTUAL (SIGVTALRM): only counts time spent in its owner process + * + * Addendum: now SIGVTALRM is used on Solaris again, because SIGALRM can + * kill the process there! */ /* POSIX: this function goes in the signal() callback */ static void interruptESC(int sig) @@ -1038,7 +1041,11 @@ if(G.afbreek==0) G.afbreek= 2; /* code for read queue */ /* call again, timer was reset */ +#ifdef __sun + signal(SIGVTALRM, interruptESC); +#else signal(SIGALRM, interruptESC); +#endif } /* POSIX: initialize timer and signal */ @@ -1053,8 +1060,13 @@ tmevalue.it_value.tv_sec = 0; tmevalue.it_value.tv_usec = 1; +#ifdef __sun + signal(SIGVTALRM, interruptESC); + setitimer(ITIMER_VIRTUAL, &tmevalue, 0); +#else signal(SIGALRM, interruptESC); setitimer(ITIMER_REAL, &tmevalue, 0); +#endif } /* POSIX: stop timer and callback */ @@ -1064,9 +1076,13 @@ memset(&tmevalue, 0, sizeof(struct itimerval)); +#ifdef __sun + setitimer(ITIMER_VIRTUAL, &tmevalue, 0); + signal(SIGVTALRM, SIG_IGN); +#else setitimer(ITIMER_REAL, &tmevalue, 0); signal(SIGALRM, SIG_IGN); - +#endif } ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14399] trunk/blender/source/blender/ blenkernel/intern:
Revision: 14399
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14399
Author: blendix
Date: 2008-04-12 20:15:10 +0200 (Sat, 12 Apr 2008)
Log Message:
---
Fix for bug #8936: particle system crash with vertex groups and
zero vertices in a mesh.
Modified Paths:
--
trunk/blender/source/blender/blenkernel/intern/particle.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
Modified: trunk/blender/source/blender/blenkernel/intern/particle.c
===
--- trunk/blender/source/blender/blenkernel/intern/particle.c 2008-04-12
17:34:48 UTC (rev 14398)
+++ trunk/blender/source/blender/blenkernel/intern/particle.c 2008-04-12
18:15:10 UTC (rev 14399)
@@ -1010,7 +1010,7 @@
float psys_interpolate_value_from_verts(DerivedMesh *dm, short from, int
index, float *fw, float *values)
{
- if(values==0)
+ if(values==0 || index==-1)
return 0.0;
switch(from){
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c
2008-04-12 17:34:48 UTC (rev 14398)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c
2008-04-12 18:15:10 UTC (rev 14399)
@@ -1116,7 +1116,8 @@
if(tot==0){
no_distr=1;
if(children){
- fprintf(stderr,"Particle child distribution error:
Nothing to emit from!\n");
+ if(G.f & G_DEBUG)
+ fprintf(stderr,"Particle child distribution
error: Nothing to emit from!\n");
for(p=0,cpa=psys->child; pfuv[0]=cpa->fuv[1]=cpa->fuv[2]=cpa->fuv[3]= 0.0;
cpa->foffset= 0.0f;
@@ -1126,7 +1127,8 @@
}
}
else {
- fprintf(stderr,"Particle distribution error: Nothing to
emit from!\n");
+ if(G.f & G_DEBUG)
+ fprintf(stderr,"Particle distribution error:
Nothing to emit from!\n");
for(p=0,pa=psys->particles; pfuv[0]=pa->fuv[1]=pa->fuv[2]= pa->fuv[3]=
0.0;
pa->foffset= 0.0f;
@@ -1737,9 +1739,8 @@
/* get possible textural influence */
psys_get_texture(ob,give_current_material(ob,part->omat),psmd,psys,pa,&ptex,MAP_PA_IVEL);
- if(vg_vel){
+ if(vg_vel && pa->num != -1)
ptex.ivel*=psys_interpolate_value_from_verts(psmd->dm,part->from,pa->num,pa->fuv,vg_vel);
- }
/* particles live in global space so*/
/* let's convert:
*/
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14400] trunk/blender/source/blender:
Revision: 14400
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14400
Author: blendix
Date: 2008-04-12 20:44:03 +0200 (Sat, 12 Apr 2008)
Log Message:
---
Fix for bug #8463: object texture mapping for duplis was changed to
act as if the object was in its original position, instead of being
different for all instances. However, this is desired behavior in
some cases and so breaks compatibility. Now it only does the new
behavior when enabling the "From Original" option.
Modified Paths:
--
trunk/blender/source/blender/makesdna/DNA_texture_types.h
trunk/blender/source/blender/render/intern/source/texture.c
trunk/blender/source/blender/src/buttons_shading.c
Modified: trunk/blender/source/blender/makesdna/DNA_texture_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_texture_types.h 2008-04-12
18:15:10 UTC (rev 14399)
+++ trunk/blender/source/blender/makesdna/DNA_texture_types.h 2008-04-12
18:44:03 UTC (rev 14400)
@@ -353,6 +353,7 @@
#define MTEX_ALPHAMIX 8
#define MTEX_VIEWSPACE 16
#define MTEX_DUPLI_MAPTO 32
+#define MTEX_OB_DUPLI_ORIG 64
/* blendtype */
#define MTEX_BLEND 0
Modified: trunk/blender/source/blender/render/intern/source/texture.c
===
--- trunk/blender/source/blender/render/intern/source/texture.c 2008-04-12
18:15:10 UTC (rev 14399)
+++ trunk/blender/source/blender/render/intern/source/texture.c 2008-04-12
18:44:03 UTC (rev 14400)
@@ -1468,8 +1468,9 @@
dx= dxt;
dy= dyt;
VECCOPY(tempvec, shi->co);
- if(shi->obi && shi->obi->duplitexmat)
-
MTC_Mat4MulVecfl(shi->obi->duplitexmat, tempvec);
+ if(mtex->texflag & MTEX_OB_DUPLI_ORIG)
+ if(shi->obi &&
shi->obi->duplitexmat)
+
MTC_Mat4MulVecfl(shi->obi->duplitexmat, tempvec);
MTC_Mat4MulVecfl(ob->imat, tempvec);
if(shi->osatex) {
VECCOPY(dxt, shi->dxco);
Modified: trunk/blender/source/blender/src/buttons_shading.c
===
--- trunk/blender/source/blender/src/buttons_shading.c 2008-04-12 18:15:10 UTC
(rev 14399)
+++ trunk/blender/source/blender/src/buttons_shading.c 2008-04-12 18:44:03 UTC
(rev 14400)
@@ -3429,7 +3429,10 @@
if(ELEM(mtex->texco, TEXCO_UV, TEXCO_ORCO))
uiDefButBitS(block, TOG, MTEX_DUPLI_MAPTO, B_MATPRV, "From
Dupli", 820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "If object is
duplicated by vertices, faces or particles, inherit texture coordinate from
parent object");
+ else if(mtex->texco == TEXCO_OBJECT)
+ uiDefButBitS(block, TOG, MTEX_OB_DUPLI_ORIG, B_MATPRV, "From
Original", 820,140,88,18, &(mtex->texflag), 0, 0, 0, 0, "If object is
duplicated, use object coordinates as if the object was in its original
position");
+
/* COORDS */
uiBlockBeginAlign(block);
uiDefButC(block, ROW, B_MATPRV, "Flat", 630,115,48,19,
&(mtex->mapping), 5.0, (float)MTEX_FLAT, 0, 0, "Maps X and Y coordinates
directly");
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14401] trunk/blender/source/blender/src/ editmesh_lib.c: active face can now be unselected, also extrude and copy keep the active face.
Revision: 14401
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14401
Author: campbellbarton
Date: 2008-04-12 21:56:53 +0200 (Sat, 12 Apr 2008)
Log Message:
---
active face can now be unselected, also extrude and copy keep the active face.
Modified Paths:
--
trunk/blender/source/blender/src/editmesh_lib.c
Modified: trunk/blender/source/blender/src/editmesh_lib.c
===
--- trunk/blender/source/blender/src/editmesh_lib.c 2008-04-12 18:44:03 UTC
(rev 14400)
+++ trunk/blender/source/blender/src/editmesh_lib.c 2008-04-12 19:56:53 UTC
(rev 14401)
@@ -80,7 +80,7 @@
EditFace * EM_get_actFace(int sloppy)
{
- if (G.editMesh->act_face && G.editMesh->act_face->f & SELECT) {
+ if (G.editMesh->act_face) {
return G.editMesh->act_face;
} else if (sloppy) {
EditFace *efa= NULL;
@@ -1100,7 +1100,7 @@
EditMesh *em = G.editMesh;
EditVert *eve, *nextve;
EditEdge *eed, *nexted;
- EditFace *efa, *nextfa;
+ EditFace *efa, *nextfa, *efan;
short del_old= 0;
ModifierData *md;
@@ -1254,27 +1254,32 @@
if(del_old==0) {// keep old faces means
flipping normal
if(efa->v4)
- addfacelist(efa->v4->tmp.v,
efa->v3->tmp.v,
+ efan = addfacelist(efa->v4->tmp.v,
efa->v3->tmp.v,
efa->v2->tmp.v,
efa->v1->tmp.v, efa, efa);
else
- addfacelist(efa->v3->tmp.v,
efa->v2->tmp.v,
+ efan = addfacelist(efa->v3->tmp.v,
efa->v2->tmp.v,
efa->v1->tmp.v,
NULL, efa, efa);
}
else {
if(efa->v4)
- addfacelist(efa->v1->tmp.v,
efa->v2->tmp.v,
+ efan = addfacelist(efa->v1->tmp.v,
efa->v2->tmp.v,
efa->v3->tmp.v,
efa->v4->tmp.v, efa, efa);
else
- addfacelist(efa->v1->tmp.v,
efa->v2->tmp.v,
+ efan = addfacelist(efa->v1->tmp.v,
efa->v2->tmp.v,
efa->v3->tmp.v,
NULL, efa, efa);
}
-
+
+ if (G.editMesh->act_face == efa) {
+ G.editMesh->act_face = efan;
+ }
+
/* for transform */
add_normal_aligned(nor, efa->n);
}
}
if(del_old) {
+
/* step 4: remove old faces, if del_old */
efa= em->faces.first;
while(efa) {
@@ -1285,7 +1290,8 @@
}
efa= nextfa;
}
-
+
+
/* step 5: remove selected unused edges */
/* start tagging again */
for(eed= em->edges.first; eed; eed= eed->next) eed->f1=0;
@@ -1700,7 +1706,7 @@
EditMesh *em = G.editMesh;
EditVert *eve, *v1, *v2, *v3, *v4;
EditEdge *eed, *newed;
- EditFace *efa, *newfa;
+ EditFace *efa, *newfa, *act_efa = EM_get_actFace(0);
EM_clear_flag_all(128);
EM_selectmode_set();// paranoia check, selection now is consistant
@@ -1747,6 +1753,10 @@
newfa= addfacelist(v1, v2, v3, v4, efa, efa);
+ if (act_efa==act_efa) {
+ EM_set_actFace(newfa);
+ }
+
newfa->f= efa->f;
efa->f -= flag;
efa->f |= 128;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14402] trunk/blender/source/blender/src: error in last commit.
Revision: 14402
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14402
Author: campbellbarton
Date: 2008-04-12 22:36:35 +0200 (Sat, 12 Apr 2008)
Log Message:
---
error in last commit. also use smaller fonts in the sequencer for frame
numbers, number string was too long.
Modified Paths:
--
trunk/blender/source/blender/src/drawseq.c
trunk/blender/source/blender/src/editmesh_lib.c
Modified: trunk/blender/source/blender/src/drawseq.c
===
--- trunk/blender/source/blender/src/drawseq.c 2008-04-12 19:56:53 UTC (rev
14401)
+++ trunk/blender/source/blender/src/drawseq.c 2008-04-12 20:36:35 UTC (rev
14402)
@@ -358,7 +358,7 @@
float x1, x2, y1, y2;
float handsize;
float minhandle, maxhandle;
- char str[120];
+ char str[32];
unsigned int whichsel=0;
View2D *v2d;
@@ -429,9 +429,9 @@
glRasterPos3f(rx1, y1-0.15, 0.0);
} else {
sprintf(str, "%d", seq->enddisp - 1);
- glRasterPos3f((x2-BMF_GetStringWidth(G.font,
str)*pixelx), y2+0.05, 0.0);
+ glRasterPos3f((x2-BMF_GetStringWidth(G.fonts,
str)*pixelx), y2+0.05, 0.0);
}
- BMF_DrawString(G.font, str);
+ BMF_DrawString(G.fonts, str);
}
}
Modified: trunk/blender/source/blender/src/editmesh_lib.c
===
--- trunk/blender/source/blender/src/editmesh_lib.c 2008-04-12 19:56:53 UTC
(rev 14401)
+++ trunk/blender/source/blender/src/editmesh_lib.c 2008-04-12 20:36:35 UTC
(rev 14402)
@@ -1753,7 +1753,7 @@
newfa= addfacelist(v1, v2, v3, v4, efa, efa);
- if (act_efa==act_efa) {
+ if (efa==act_efa) {
EM_set_actFace(newfa);
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14403] trunk/blender/source/gameengine/ GamePlayer: fix BGE bug #8880: blenderplayer closing when esc is pressed
Revision: 14403
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14403
Author: ben2610
Date: 2008-04-12 23:18:58 +0200 (Sat, 12 Apr 2008)
Log Message:
---
fix BGE bug #8880: blenderplayer closing when esc is pressed
ESC now quits the game by default in all modes unless a keyboard sensor is set
on ESC.
In this case, the game designer must arrange for an alternative way to quit the
game.
Modified Paths:
--
trunk/blender/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
Modified: trunk/blender/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
===
--- trunk/blender/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
2008-04-12 20:36:35 UTC (rev 14402)
+++ trunk/blender/source/gameengine/GamePlayer/common/GPC_KeyboardDevice.h
2008-04-12 21:18:58 UTC (rev 14403)
@@ -58,9 +58,9 @@
* System dependent keyboard codes are stored as ints.
*/
std::map m_reverseKeyTranslateTable;
- bool m_hookesc;
public:
+ bool m_hookesc;
GPC_KeyboardDevice()
: m_hookesc(false)
{
Modified: trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
===
--- trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
2008-04-12 20:36:35 UTC (rev 14402)
+++ trunk/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
2008-04-12 21:18:58 UTC (rev 14403)
@@ -845,11 +845,12 @@
{
GHOST_TEventDataPtr eventData =
((GHOST_IEvent*)event)->getData();
GHOST_TEventKeyData* keyData =
static_cast(eventData);
- if (fSystem->getFullScreen()) {
- if (keyData->key == GHOST_kKeyEsc) {
+ //no need for this test
+ //if (fSystem->getFullScreen()) {
+ if (keyData->key == GHOST_kKeyEsc &&
!m_keyboard->m_hookesc) {
m_exitRequested = KX_EXIT_REQUEST_OUTSIDE;
}
- }
+ //}
m_keyboard->ConvertEvent(keyData->key, isDown);
handled = true;
}
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14404] trunk/blender/source/blender/ render/intern/source/rendercore.c:
Revision: 14404
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14404
Author: blendix
Date: 2008-04-12 23:44:08 +0200 (Sat, 12 Apr 2008)
Log Message:
---
Fix for bug #8927: halo blending with solid has poor antialiasing,
which as far as I can see is an old issue, but with FSA it is quite
simple to do better.
Modified Paths:
--
trunk/blender/source/blender/render/intern/source/rendercore.c
Modified: trunk/blender/source/blender/render/intern/source/rendercore.c
===
--- trunk/blender/source/blender/render/intern/source/rendercore.c
2008-04-12 21:18:58 UTC (rev 14403)
+++ trunk/blender/source/blender/render/intern/source/rendercore.c
2008-04-12 21:44:08 UTC (rev 14404)
@@ -168,8 +168,9 @@
static void halo_pixelstruct(HaloRen *har, RenderLayer **rlpp, int totsample,
int od, float dist, float xn, float yn, PixStr *ps)
{
float col[4], accol[4];
- int amount, amountm, zz, flarec, sample;
+ int amount, amountm, zz, flarec, sample, fullsample, mask=0;
+ fullsample= (totsample > 1);
amount= 0;
accol[0]=accol[1]=accol[2]=accol[3]= 0.0f;
flarec= har->flarec;
@@ -183,35 +184,56 @@
float fac;
shadeHaloFloat(har, col, zz, dist, xn, yn, flarec);
- fac= ((float)amountm)/(float)R.osa;
- accol[0]+= fac*col[0];
- accol[1]+= fac*col[1];
- accol[2]+= fac*col[2];
- accol[3]+= fac*col[3];
flarec= 0;
+
+ if(fullsample) {
+ for(sample=0; samplemask & (1 << sample))
+
addalphaAddfacFloat(rlpp[sample]->rectf + od*4, col, har->add);
+ }
+ else {
+ fac= ((float)amountm)/(float)R.osa;
+ accol[0]+= fac*col[0];
+ accol[1]+= fac*col[1];
+ accol[2]+= fac*col[2];
+ accol[3]+= fac*col[3];
+ }
}
+ mask |= ps->mask;
ps= ps->next;
}
+
/* now do the sky sub-pixels */
amount= R.osa-amount;
if(amount) {
float fac;
shadeHaloFloat(har, col, 0x7F, dist, xn, yn, flarec);
- fac= ((float)amount)/(float)R.osa;
- accol[0]+= fac*col[0];
- accol[1]+= fac*col[1];
- accol[2]+= fac*col[2];
- accol[3]+= fac*col[3];
+
+ if(!fullsample) {
+ fac= ((float)amount)/(float)R.osa;
+ accol[0]+= fac*col[0];
+ accol[1]+= fac*col[1];
+ accol[2]+= fac*col[2];
+ accol[3]+= fac*col[3];
+ }
}
- col[0]= accol[0];
- col[1]= accol[1];
- col[2]= accol[2];
- col[3]= accol[3];
-
- for(sample=0; samplerectf + od*4, col, har->add);
+
+ if(fullsample) {
+ for(sample=0; samplerectf + od*4,
col, har->add);
+ }
+ else {
+ col[0]= accol[0];
+ col[1]= accol[1];
+ col[2]= accol[2];
+ col[3]= accol[3];
+
+ for(sample=0; samplerectf + od*4, col,
har->add);
+ }
}
static void halo_tile(RenderPart *pa, RenderLayer *rl)
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14405] trunk/blender/source: Made octree size always available since its used for baking.
Revision: 14405
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14405
Author: campbellbarton
Date: 2008-04-13 00:17:23 +0200 (Sun, 13 Apr 2008)
Log Message:
---
Made octree size always available since its used for baking.
Documented obscure environment variables
Modified Paths:
--
trunk/blender/source/blender/src/buttons_scene.c
trunk/blender/source/creator/creator.c
Modified: trunk/blender/source/blender/src/buttons_scene.c
===
--- trunk/blender/source/blender/src/buttons_scene.c2008-04-12 21:44:08 UTC
(rev 14404)
+++ trunk/blender/source/blender/src/buttons_scene.c2008-04-12 22:17:23 UTC
(rev 14405)
@@ -2191,8 +2191,7 @@
uiDefButS(block, ROW,800,"Key",
456,13,35,20,&G.scene->r.alphamode,3.0,2.0, 0, 0, "Alpha and color values
remain unchanged");
uiBlockEndAlign(block);
- if(G.scene->r.mode & R_RAYTRACE)
- uiDefButS(block, MENU, B_DIFF,"Octree resolution %t|64 %x64|128
%x128|256 %x256|512 %x512", 496,13,64,20,&G.scene->r.ocres,0.0,0.0, 0, 0,
"Octree resolution for ray tracing");
+ uiDefButS(block, MENU, B_DIFF,"Octree resolution %t|64 %x64|128
%x128|256 %x256|512 %x512", 496,13,64,20,&G.scene->r.ocres,0.0,0.0, 0, 0,
"Octree resolution for ray tracing and baking, Use higher values for complex
scenes");
uiBlockBeginAlign(block);
uiDefButBitI(block, TOG, R_SHADOW, B_REDR,"Shadow", 565,172,52,29,
&G.scene->r.mode, 0, 0, 0, 0, "Enable shadow calculation");
Modified: trunk/blender/source/creator/creator.c
===
--- trunk/blender/source/creator/creator.c 2008-04-12 21:44:08 UTC (rev
14404)
+++ trunk/blender/source/creator/creator.c 2008-04-12 22:17:23 UTC (rev
14405)
@@ -230,6 +230,18 @@
printf (" -v\t\tPrint Blender version and exit\n");
printf (" --\t\tEnds option processing. Following arguments are \n");
printf ("\t\t passed unchanged. Access via Python's sys.argv\n");
+ printf ("\nEnironment Variables:\n");
+ printf (" $HOME\t\t\tStore files such as .blender/ .B.blend .Bfs .Blog
here.\n");
+#ifdef WIN32
+ printf (" $TEMP\t\tStore temporary files here.\n");
+#else
+ printf (" $TMP or $TMPDIR\tStore temporary files here.\n");
+ printf (" $SDL_AUDIODRIVER\tLibSDL audio driver - alsa, esd, alsa,
dma.\n");
+ printf (" $BF_TIFF_LIB\t\tUse an alternative libtiff.so for loading
tiff image files.\n");
+#endif
+ printf (" $IMAGEEDITOR\t\tImage editor executable, launch with the
IKey from the file selector.\n");
+ printf (" $WINEDITOR\t\tText editor executable, launch with the EKey
from the file selector.\n");
+ printf (" $PYTHONHOME\t\tPath to the python directory, eg.
/usr/lib/python.\n");
printf ("\nNote: Arguments must be separated by white space. eg:\n");
printf ("\"blender -ba test.blend\"\n");
printf (" ...will ignore the 'a'\n");
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14406] trunk/blender/source/blender/src/ transform.c: -> Bevel transform crash fix
Revision: 14406
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14406
Author: briggs
Date: 2008-04-13 07:51:13 +0200 (Sun, 13 Apr 2008)
Log Message:
---
-> Bevel transform crash fix
Transinfo transform event callback is not cleared once
a transform event is over, this casued handleEventBevel
to dereference a null pointer. Added a check for this,
but it seems the callbacks should be set to NULL when
transform loop is done?
Modified Paths:
--
trunk/blender/source/blender/src/transform.c
Modified: trunk/blender/source/blender/src/transform.c
===
--- trunk/blender/source/blender/src/transform.c2008-04-12 22:17:23 UTC
(rev 14405)
+++ trunk/blender/source/blender/src/transform.c2008-04-13 05:51:13 UTC
(rev 14406)
@@ -3366,6 +3366,8 @@
int handleEventBevel(TransInfo *t, unsigned short event, short val)
{
if (val) {
+ if(!G.editBMesh) return 0;
+
switch (event) {
case MIDDLEMOUSE:
G.editBMesh->options ^= BME_BEVEL_VERT;
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
