[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60205] trunk/blender/source/blender/ editors/transform: Fix crash with recently added remove_on_cancel transform property, and hide this

[Brecht Van Lommel]

Revision: 60205
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60205
Author:   blendix
Date:     2013-09-17 16:12:05 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
Fix crash with recently added remove_on_cancel transform property, and hide this
property in the user interface.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_generics.c
    trunk/blender/source/blender/editors/transform/transform_ops.c

Modified: trunk/blender/source/blender/editors/transform/transform_generics.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_generics.c	2013-09-17 15:20:44 UTC (rev 60204)
+++ trunk/blender/source/blender/editors/transform/transform_generics.c	2013-09-17 16:12:05 UTC (rev 60205)
@@ -1106,7 +1106,8 @@
 	}
 
 	t->remove_on_cancel = false;
-	if ((prop = RNA_struct_find_property(op->ptr, "remove_on_cancel")) && RNA_property_is_set(op->ptr, prop)) {
+
+	if (op && (prop = RNA_struct_find_property(op->ptr, "remove_on_cancel")) && RNA_property_is_set(op->ptr, prop)) {
 		if (RNA_property_boolean_get(op->ptr, prop)) {
 			t->remove_on_cancel = true;
 		}

Modified: trunk/blender/source/blender/editors/transform/transform_ops.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_ops.c	2013-09-17 15:20:44 UTC (rev 60204)
+++ trunk/blender/source/blender/editors/transform/transform_ops.c	2013-09-17 16:12:05 UTC (rev 60205)
@@ -537,7 +537,8 @@
 
 	if (flags & P_OPTIONS) {
 		RNA_def_boolean(ot->srna, "texture_space", 0, "Edit Texture Space", "Edit Object data texture space");
-		RNA_def_boolean(ot->srna, "remove_on_cancel", 0, "Remove on Cancel", "Remove elements on cancel");
+		prop = RNA_def_boolean(ot->srna, "remove_on_cancel", 0, "Remove on Cancel", "Remove elements on cancel");
+		RNA_def_property_flag(prop, PROP_HIDDEN);
 	}
 
 	if (flags & P_CORRECT_UV) {