Revision: 15109
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15109
Author: unclezeiv
Date: 2008-06-03 23:51:46 +0200 (Tue, 03 Jun 2008)
Log Message:
-----------
svn merge -r 14672:14673
https://svn.blender.org/svnroot/bf-blender/trunk/blender
So far I've been merging specifying wrong ranges (first revision off by one);
luckily, this is the only missed revision affecting trunk.
Modified Paths:
--------------
branches/soc-2008-unclezeiv/source/blender/src/ghostwinlay.c
Modified: branches/soc-2008-unclezeiv/source/blender/src/ghostwinlay.c
===================================================================
--- branches/soc-2008-unclezeiv/source/blender/src/ghostwinlay.c
2008-06-03 21:39:36 UTC (rev 15108)
+++ branches/soc-2008-unclezeiv/source/blender/src/ghostwinlay.c
2008-06-03 21:51:46 UTC (rev 15109)
@@ -927,6 +927,42 @@
}
ndofLib = PIL_dynlib_open(plug_path);
+
+ /* On systems where blender is installed in /usr/bin/blender,
~/.blender/plugins/ is a better place to look */
+ if (ndofLib==NULL) {
+
+ if (plug_path) {
+ MEM_freeN(plug_path);
+ }
+
+ inst_path = BLI_gethome();
+ if (inst_path) {
+ size_t len = strlen(inst_path) + strlen(plug_dir) +
strlen(PATH_SEP)*2
+ + strlen(plug_name) + 1;
+
+ if (!strstr(inst_path, ".blender")) {
+ len += strlen(".blender") + strlen(PATH_SEP);
+ }
+
+ plug_path = MEM_mallocN(len, "ndofpluginpath");
+ if (plug_path) {
+ strncpy(plug_path, inst_path, len);
+ strcat(plug_path, PATH_SEP);
+ if (!strstr(inst_path, ".blender")) {
+ strcat(plug_path, ".blender");
+ strcat(plug_path, PATH_SEP);
+ }
+ strcat(plug_path, plug_dir);
+ strcat(plug_path, PATH_SEP);
+ strcat(plug_path, plug_name);
+ }
+ }
+
+ ndofLib = PIL_dynlib_open(plug_path);
+ }
+
+
+
#if 0
fprintf(stderr, "plugin path=%s; ndofLib=%p\n", plug_path,
(void*)ndofLib);
#endif
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
