SOURCES: blender-config.opts, blender-noxml-yafray.patch - updated...

[megabajt]

Author: megabajt                     Date: Fri Apr 14 10:03:40 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 2.41

---- Files affected:
SOURCES:
   blender-config.opts (1.2 -> 1.3) , blender-noxml-yafray.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/blender-config.opts
diff -u SOURCES/blender-config.opts:1.2 SOURCES/blender-config.opts:1.3
--- SOURCES/blender-config.opts:1.2	Sat Feb 19 19:00:42 2005
+++ SOURCES/blender-config.opts	Fri Apr 14 12:03:35 2006
@@ -1,5 +1,5 @@
 # Configuration file containing user definable options.
-VERSION = '2.33-cvs'
+VERSION = '2.41'
 BUILD_BINARY = 'release'
 USE_BUILDINFO = 'true'
 BUILD_BLENDER_DYNAMIC = 'true'
@@ -19,6 +19,7 @@
 USE_OPENAL = 'true'
 USE_FMOD = 'false'
 USE_QUICKTIME = 'false'
+USE_FLUIDSIM = 'true'
 
 # Compiler information.
 HOST_CC = 'gcc'
@@ -49,6 +50,9 @@
 JPEG_INCLUDE = ['/usr/include']
 JPEG_LIBPATH = ['/usr/lib']
 JPEG_LIBRARY = ['jpeg']
+TIFF_INCLUDE = ['/usr/include']
+TIFF_LIBPATH = ['/usr/lib']
+TIFF_LIBRARY = ['tiff']
 OPENGL_INCLUDE = ['/usr/include']
 OPENGL_LIBPATH = ['/usr/lib', '/usr/X11R6/lib']
 OPENGL_LIBRARY = ['GL', 'GLU']
@@ -65,9 +69,12 @@
 ODE_INCLUDE = ['#../lib/linux-glibc2.2.5-i386/ode/include']
 ODE_LIBPATH = ['#../lib/linux-glibc2.2.5-i386/ode/lib']
 ODE_LIBRARY = ['ode']
+BULLET_INCLUDE = ['#extern/bullet', '#extern/bullet/LinearMath', '#extern/bullet/Bullet', '#extern/bullet/BulletDynamics']
+BULLET_LIBPATH = []
+BULLET_LIBRARY = []
 OPENAL_INCLUDE = ['/usr/include']
 OPENAL_LIBPATH = ['/usr/lib']
-OPENAL_LIBRARY = ['openal']
+OPENAL_LIBRARY = ['openal', 'alut']
 
 # The following information is only necessary when building with
 # internationalization support.

================================================================
Index: SOURCES/blender-noxml-yafray.patch
diff -u SOURCES/blender-noxml-yafray.patch:1.2 SOURCES/blender-noxml-yafray.patch:1.3
--- SOURCES/blender-noxml-yafray.patch:1.2	Mon Jun 20 15:02:21 2005
+++ SOURCES/blender-noxml-yafray.patch	Fri Apr 14 12:03:35 2006
@@ -1,11 +1,12 @@
---- blender/source/blender/src/buttons_scene.c.old	2005-06-20 14:57:25.000000000 +0200
-+++ blender/source/blender/src/buttons_scene.c	2005-06-20 14:57:44.000000000 +0200
-@@ -1332,7 +1332,7 @@
+diff -urN blender/source/blender/src/buttons_scene.c blender.new/source/blender/src/buttons_scene.c
+--- blender/source/blender/src/buttons_scene.c	2006-01-06 13:37:45.000000000 +0100
++++ blender.new/source/blender/src/buttons_scene.c	2006-04-13 18:11:55.000000000 +0200
+@@ -1392,7 +1392,7 @@
  	// label to force a boundbox for buttons not to be centered
  	uiDefBut(block, LABEL, 0, " ", 305,180,10,10, 0, 0, 0, 0, 0, "");
  
--	uiDefButS(block,TOGN|BIT|0, B_REDR, "xml", 5,180,75,20, &G.scene->r.YFexportxml,
-+	uiDefButS(block,TOG|BIT|0, B_REDR, "xml", 5,180,75,20, &G.scene->r.YFexportxml,
+-	uiDefButBitS(block, TOGN, 1, B_REDR, "xml", 5,180,75,20, &G.scene->r.YFexportxml,
++	uiDefButBitS(block, TOG, 1, B_REDR, "xml", 5,180,75,20, &G.scene->r.YFexportxml,
  					0, 0, 0, 0, "Export to an xml file and call yafray instead of plugin");
  
  	uiDefButF(block, NUMSLI, B_DIFF,"Bi ", 5,35,150,20,	&(G.scene->r.YF_raybias), 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/blender-config.opts?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/blender-noxml-yafray.patch?r1=1.2&r2=1.3&f=u