- try to load /usr/share/BlenderLanguages file, if .Blanguages search fails

- disable xml to yafray patch

Changed files:
    blender-blanguages.patch -> 1.1
    blender-noxml-yafray.patch -> 1.1

diff --git a/blender-blanguages.patch b/blender-blanguages.patch
new file mode 100644 (file)
index 0000000..2525415
--- /dev/null
+++ b/blender-blanguages.patch
@@ -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;
+                       }
+               }

diff --git a/blender-noxml-yafray.patch b/blender-noxml-yafray.patch
new file mode 100644 (file)
index 0000000..1effcfd
--- /dev/null
+++ b/blender-noxml-yafray.patch
@@ -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)");