[Bf-blender-cvs] [497e1de] master: Fix for constraint poll function succeeding when no constraint exists

Campbell Barton noreply at git.blender.org
Wed Feb 26 03:50:00 CET 2014


Commit: 497e1de25b35b453c0f93bade783fd15d19bde9b
Author: Campbell Barton
Date:   Wed Feb 26 13:09:58 2014 +1100
https://developer.blender.org/rB497e1de25b35b453c0f93bade783fd15d19bde9b

Fix for constraint poll function succeeding when no constraint exists

===================================================================

M	source/blender/editors/object/object_constraint.c

===================================================================

diff --git a/source/blender/editors/object/object_constraint.c b/source/blender/editors/object/object_constraint.c
index 3d055e7..9f77d3e 100644
--- a/source/blender/editors/object/object_constraint.c
+++ b/source/blender/editors/object/object_constraint.c
@@ -542,7 +542,7 @@ static int edit_constraint_poll_generic(bContext *C, StructRNA *rna_type)
 	PointerRNA ptr = CTX_data_pointer_get_type(C, "constraint", rna_type);
 	Object *ob = (ptr.id.data) ? ptr.id.data : ED_object_active_context(C);
 
-	if (!ob || ob->id.lib) return 0;
+	if (!ptr.data || !ob || ob->id.lib) return 0;
 	if (ptr.id.data && ((ID *)ptr.id.data)->lib) return 0;
 
 	return 1;




More information about the Bf-blender-cvs mailing list