[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56279] trunk/blender/source/blender: minor fixes
Campbell Barton
ideasman42 at gmail.com
Wed Apr 24 22:19:02 CEST 2013
Revision: 56279
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56279
Author: campbellbarton
Date: 2013-04-24 20:19:01 +0000 (Wed, 24 Apr 2013)
Log Message:
-----------
minor fixes
- build with netbsd works again.
- select uv more/less was crashing when called outside image space.
- node RNA property update was crashing when not called in node space.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/intern/storage.c
trunk/blender/source/blender/editors/space_node/node_draw.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified: trunk/blender/source/blender/blenlib/intern/storage.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/storage.c 2013-04-24 20:12:12 UTC (rev 56278)
+++ trunk/blender/source/blender/blenlib/intern/storage.c 2013-04-24 20:19:01 UTC (rev 56279)
@@ -31,27 +31,26 @@
* \ingroup bli
*/
-
#include <sys/types.h>
#include <stdio.h>
#include <stdlib.h>
#ifndef WIN32
-#include <dirent.h>
+# include <dirent.h>
#endif
#include <time.h>
#include <sys/stat.h>
#if defined(__sun__) || defined(__sun) || defined(__NetBSD__)
-#include <sys/statvfs.h> /* Other modern unix os's should probably use this also */
+# include <sys/statvfs.h> /* Other modern unix os's should probably use this also */
#elif !defined(__FreeBSD__) && !defined(linux) && (defined(__sparc) || defined(__sparc__))
-#include <sys/statfs.h>
+# include <sys/statfs.h>
#endif
-#if defined(__FreeBSD__) || defined(__OpenBSD__)
-#include <sys/param.h>
-#include <sys/mount.h>
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+# include <sys/param.h>
+# include <sys/mount.h>
#endif
#if defined(linux) || defined(__CYGWIN32__) || defined(__hpux) || defined(__GNU__) || defined(__GLIBC__)
@@ -59,9 +58,9 @@
#endif
#ifdef __APPLE__
-/* For statfs */
-#include <sys/param.h>
-#include <sys/mount.h>
+ /* For statfs */
+# include <sys/param.h>
+# include <sys/mount.h>
#endif /* __APPLE__ */
Modified: trunk/blender/source/blender/editors/space_node/node_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_draw.c 2013-04-24 20:12:12 UTC (rev 56278)
+++ trunk/blender/source/blender/editors/space_node/node_draw.c 2013-04-24 20:19:01 UTC (rev 56279)
@@ -75,10 +75,13 @@
void ED_node_tree_update(const bContext *C)
{
SpaceNode *snode = CTX_wm_space_node(C);
- snode_set_context(C);
-
- if (snode->nodetree && snode->nodetree->id.us == 0)
- snode->nodetree->id.us = 1;
+ if (snode) {
+ snode_set_context(C);
+
+ if (snode->nodetree && snode->nodetree->id.us == 0) {
+ snode->nodetree->id.us = 1;
+ }
+ }
}
/* id is supposed to contain a node tree */
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2013-04-24 20:12:12 UTC (rev 56278)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2013-04-24 20:19:01 UTC (rev 56279)
@@ -1444,7 +1444,7 @@
/* api callbacks */
ot->exec = uv_select_more_exec;
- ot->poll = ED_operator_uvedit;
+ ot->poll = ED_operator_uvedit_space_image;
}
static int uv_select_less_exec(bContext *C, wmOperator *UNUSED(op))
@@ -1462,7 +1462,7 @@
/* api callbacks */
ot->exec = uv_select_less_exec;
- ot->poll = ED_operator_uvedit;
+ ot->poll = ED_operator_uvedit_space_image;
}
/* ******************** align operator **************** */
More information about the Bf-blender-cvs
mailing list