Author: gj Date: Sat Feb 19 20:13:47 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- try to load /usr/share/BlenderLanguages file, if .Blanguages search fails
- disable xml to yafray patch
---- Files affected:
SOURCES:
blender-blanguages.patch (NONE -> 1.1) (NEW), blender-noxml-yafray.patch
(NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/blender-blanguages.patch
diff -u /dev/null SOURCES/blender-blanguages.patch:1.1
--- /dev/null Sat Feb 19 21:13:47 2005
+++ SOURCES/blender-blanguages.patch Sat Feb 19 21:13:42 2005
@@ -0,0 +1,25 @@
+diff -urN blender/source/blender/src/language.c
blendermod/source/blender/src/language.c
+--- blender/source/blender/src/language.c 2004-11-08 16:46:57.000000000
+0100
++++ blendermod/source/blender/src/language.c 2005-02-19 20:17:21.000000000
+0100
+@@ -323,12 +323,20 @@
+ #endif
+ lines= BLI_read_file_as_lines(name);
+
++ if (lines == NULL) {
++#if defined (__APPLE__)
++#else
++ strcpy(name, "/usr/share/BlenderLanguages");
++ lines= BLI_read_file_as_lines(name);
++#endif
++ }
++
+ if(lines == NULL) {
+ /* If not found in .blender, try current dir */
+ strcpy(name, ".Blanguages");
+ lines= BLI_read_file_as_lines(name);
+ if(lines == NULL) {
+- error("File \".Blanguages\" not found");
++ error("File \".Blanguages\" or
\"/usr/share/BlenderLanguages\" not found");
+ return 0;
+ }
+ }
================================================================
Index: SOURCES/blender-noxml-yafray.patch
diff -u /dev/null SOURCES/blender-noxml-yafray.patch:1.1
--- /dev/null Sat Feb 19 21:13:47 2005
+++ SOURCES/blender-noxml-yafray.patch Sat Feb 19 21:13:42 2005
@@ -0,0 +1,12 @@
+diff -urN blender/source/blender/src/buttons_scene.c
/home/users/gj/rpm/BUILD/blender/source/blender/src/buttons_scene.c
+--- blender/source/blender/src/buttons_scene.c 2005-02-19 20:44:28.000000000
+0100
++++ /home/users/gj/rpm/BUILD/blender/source/blender/src/buttons_scene.c
2005-02-19 20:38:53.000000000 +0100
+@@ -1363,7 +1363,7 @@
+
+ uiDefButS(block,TOGN|BIT|0, B_REDR, "Auto AA", 5,140,150,20,
&G.scene->r.YF_AA,
+ 0, 0, 0, 0, "Set AA using OSA and GI
quality, disable for manual control");
+- uiDefButS(block,TOGN|BIT|0, B_REDR, "xml", 175,140,75,20,
&G.scene->r.YFexportxml,
++ uiDefButS(block,TOG|BIT|0, B_REDR, "xml", 175,140,75,20,
&G.scene->r.YFexportxml,
+ 0, 0, 0, 0, "Export to an xml file and
call yafray instead of plugin");
+ if(G.scene->r.YF_AA){
+ uiDefButI(block, NUM, B_DIFF, "AA Passes ", 5,115,150,20,
&G.scene->r.YF_AApasses, 0, 64, 10, 10, "Number of AA passes (0 is no AA)");
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
