[Bf-blender-cvs] [3fec3f0] master: Fix T41737 using append from menu will result in error message

Andrea Weikert noreply at git.blender.org
Sun Sep 7 16:06:15 CEST 2014


Commit: 3fec3f0bce0a49a09afd76e175d3d95e0cff9e96
Author: Andrea Weikert
Date:   Sun Sep 7 14:56:21 2014 +0200
Branches: master
https://developer.blender.org/rB3fec3f0bce0a49a09afd76e175d3d95e0cff9e96

Fix T41737 using append from menu will result in error message

message in terminal was: RNA_boolean_get: WM_OT_append.relative_path not found.
Added check for existence of the relative path property which was removed from append
since it is not needed and used.

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

M	source/blender/windowmanager/intern/wm_operators.c

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

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 1fef23e..bc79879 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2470,7 +2470,7 @@ static short wm_link_append_flag(wmOperator *op)
 
 	if (RNA_boolean_get(op->ptr, "autoselect")) flag |= FILE_AUTOSELECT;
 	if (RNA_boolean_get(op->ptr, "active_layer")) flag |= FILE_ACTIVELAY;
-	if (RNA_boolean_get(op->ptr, "relative_path")) flag |= FILE_RELPATH;
+	if (RNA_struct_find_property(op->ptr, "relative_path") && RNA_boolean_get(op->ptr, "relative_path")) flag |= FILE_RELPATH;
 	if (RNA_boolean_get(op->ptr, "link")) flag |= FILE_LINK;
 	if (RNA_boolean_get(op->ptr, "instance_groups")) flag |= FILE_GROUP_INSTANCE;




More information about the Bf-blender-cvs mailing list