[Bf-blender-cvs] [7188250523a] master: Fix missing NULL check in recent transform changes

Campbell Barton noreply at git.blender.org
Thu Feb 28 02:31:11 CET 2019


Commit: 7188250523add2e66bdfcaa4e086ab07ffb4b691
Author: Campbell Barton
Date:   Thu Feb 28 12:14:14 2019 +1100
Branches: master
https://developer.blender.org/rB7188250523add2e66bdfcaa4e086ab07ffb4b691

Fix missing NULL check in recent transform changes

Caused bevel to crash.

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

M	source/blender/editors/transform/transform_generics.c

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

diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 4039252e500..93bfb7261a8 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1522,10 +1522,10 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 		t->around = V3D_AROUND_CENTER_BOUNDS;
 	}
 
-	if ((prop = RNA_struct_find_property(op->ptr, "orient_axis"))) {
+	if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis"))) {
 		t->orient_axis = RNA_property_enum_get(op->ptr, prop);
 	}
-	if ((prop = RNA_struct_find_property(op->ptr, "orient_axis_ortho"))) {
+	if (op && (prop = RNA_struct_find_property(op->ptr, "orient_axis_ortho"))) {
 		t->orient_axis_ortho = RNA_property_enum_get(op->ptr, prop);
 	}



More information about the Bf-blender-cvs mailing list