[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16798] branches/soc-2008-mxcurioni: soc-2008-mxcurioni: merged changes to revision 16795 (repaired)

[Maxime Curioni]

Revision: 16798
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16798
Author:   mxcurioni
Date:     2008-09-28 22:15:52 +0200 (Sun, 28 Sep 2008)

Log Message:
-----------
soc-2008-mxcurioni: merged changes to revision 16795 (repaired)

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16795

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/extern/fftw/config.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
    branches/soc-2008-mxcurioni/source/blender/include/butspace.h
    branches/soc-2008-mxcurioni/source/blender/src/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/yafray/SConscript

Modified: branches/soc-2008-mxcurioni/extern/fftw/config.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/fftw/config.h	2008-09-28 20:07:59 UTC (rev 16797)
+++ branches/soc-2008-mxcurioni/extern/fftw/config.h	2008-09-28 20:15:52 UTC (rev 16798)
@@ -121,7 +121,7 @@
 /* #undef HAVE_GETHRTIME */
 
 /* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
+/* #undef HAVE_GETTIMEOFDAY */
 
 /* Define to 1 if hrtime_t is defined in <sys/time.h> */
 /* #undef HAVE_HRTIME_T */
@@ -214,7 +214,7 @@
 #define HAVE_SYS_SYSCTL_H 1
 
 /* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
+/* #undef HAVE_SYS_TIME_H */
 
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1
@@ -232,7 +232,7 @@
 #define HAVE_UINTPTR_T 1
 
 /* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
+/* #undef HAVE_UNISTD_H */
 
 /* Define to 1 if you have the `vprintf' function. */
 #define HAVE_VPRINTF 1

Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c	2008-09-28 20:07:59 UTC (rev 16797)
+++ branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c	2008-09-28 20:15:52 UTC (rev 16798)
@@ -272,7 +272,6 @@
 	strcpy(sce->r.backbuf, "//backbuf");
 	strcpy(sce->r.pic, U.renderdir);
 
-
 	BLI_init_rctf(&sce->r.safety, 0.1f, 0.9f, 0.1f, 0.9f);
 	sce->r.osa= 8;
 

Modified: branches/soc-2008-mxcurioni/source/blender/include/butspace.h
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/include/butspace.h	2008-09-28 20:07:59 UTC (rev 16797)
+++ branches/soc-2008-mxcurioni/source/blender/include/butspace.h	2008-09-28 20:15:52 UTC (rev 16798)
@@ -315,8 +315,6 @@
 #define B_FS_PIC		1601
 #define B_FS_BACKBUF	1602
 
-#define B_FS_FRS 1603
-
 #define B_FS_FTYPE		1604 /* FTYPE is no more */
 #define B_DORENDER		1605
 #define B_DOANIM		1606
@@ -371,7 +369,6 @@
 #define B_SEQ_BUT_RELOAD_FILE   1696
 #define B_SEQ_BUT_REBUILD_PROXY 1697
 #define B_SEQ_SEL_PROXY_DIR     1698
-
 /* *********************** */
 #define B_ARMATUREBUTS		1800
 #define	B_POSE			1701

Modified: branches/soc-2008-mxcurioni/source/blender/src/keyframing.c
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/src/keyframing.c	2008-09-28 20:07:59 UTC (rev 16797)
+++ branches/soc-2008-mxcurioni/source/blender/src/keyframing.c	2008-09-28 20:15:52 UTC (rev 16798)
@@ -1744,7 +1744,7 @@
 				if (achan && achan->ipo)
 					icu= achan->ipo->curve.first; 
 			}
-			else
+			else if(cks->ipo)
 				icu= cks->ipo->curve.first;
 				
 			/* we get adrcodes directly from IPO curves (see method below...) */

Modified: branches/soc-2008-mxcurioni/source/blender/yafray/SConscript
===================================================================
--- branches/soc-2008-mxcurioni/source/blender/yafray/SConscript	2008-09-28 20:07:59 UTC (rev 16797)
+++ branches/soc-2008-mxcurioni/source/blender/yafray/SConscript	2008-09-28 20:15:52 UTC (rev 16798)
@@ -6,4 +6,4 @@
 incs = '#/intern/guardedalloc ../blenlib ../makesdna ../blenkernel'
 incs += ' ../imbuf ../include ../render/extern/include ../render/intern/include'
 
-env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] )
\ No newline at end of file
+env.BlenderLib ( 'bf_yafray', sources, Split(incs), [], libtype=['blender','player'], priority=[5, 190] )