Revision: 26574
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26574
Author: campbellbarton
Date: 2010-02-03 11:16:12 +0100 (Wed, 03 Feb 2010)
Log Message:
-----------
[#20905] Blender 2.5 - Crash on drag an drop
Only allow dnd' adding objects in object mode.
Modified Paths:
--------------
trunk/blender/source/blender/editors/object/object_add.c
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2010-02-03
10:00:43 UTC (rev 26573)
+++ trunk/blender/source/blender/editors/object/object_add.c 2010-02-03
10:16:12 UTC (rev 26574)
@@ -1695,6 +1695,20 @@
/* **************** add named object, for dragdrop ************* */
/* contextual operator dupli */
+
+static int add_named_poll(bContext *C)
+{
+ if(!ED_operator_scene_editable(C)) {
+ return 0;
+ } else {
+ Object *ob= CTX_data_active_object(C);
+ if(ob && ob->mode != OB_MODE_OBJECT)
+ return 0;
+ else
+ return 1;
+ }
+}
+
static int add_named_exec(bContext *C, wmOperator *op)
{
Scene *scene= CTX_data_scene(C);
@@ -1745,7 +1759,7 @@
/* api callbacks */
ot->exec= add_named_exec;
- ot->poll= ED_operator_scene_editable;
+ ot->poll= add_named_poll;
/* flags */
ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
