[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31793] trunk/blender/source/blender/ editors/screen/screen_ops.c: bugfix [#23702] Parent to hidden object crashes
Campbell Barton
ideasman42 at gmail.com
Tue Sep 7 00:10:51 CEST 2010
Revision: 31793
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31793
Author: campbellbarton
Date: 2010-09-07 00:10:51 +0200 (Tue, 07 Sep 2010)
Log Message:
-----------
bugfix [#23702] Parent to hidden object crashes
Modified Paths:
--------------
trunk/blender/source/blender/editors/screen/screen_ops.c
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2010-09-06 22:00:15 UTC (rev 31792)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2010-09-06 22:10:51 UTC (rev 31793)
@@ -192,13 +192,14 @@
int ED_operator_object_active(bContext *C)
{
- return NULL != ED_object_active_context(C);
+ Object *ob = ED_object_active_context(C);
+ return ((ob != NULL) && !(ob->restrictflag & OB_RESTRICT_VIEW));
}
int ED_operator_object_active_editable(bContext *C)
{
Object *ob = ED_object_active_context(C);
- return ((ob != NULL) && !(ob->id.lib));
+ return ((ob != NULL) && !(ob->id.lib) && !(ob->restrictflag & OB_RESTRICT_VIEW));
}
int ED_operator_editmesh(bContext *C)
More information about the Bf-blender-cvs
mailing list