[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35619] trunk/blender/source/blender/ editors: Safety checks for macro defines

[Joshua Leung]

Revision: 35619
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35619
Author:   aligorith
Date:     2011-03-18 23:14:24 +0000 (Fri, 18 Mar 2011)
Log Message:
-----------
Safety checks for macro defines

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_action/action_ops.c
    trunk/blender/source/blender/editors/space_graph/graph_ops.c

Modified: trunk/blender/source/blender/editors/space_action/action_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_ops.c      
2011-03-18 21:59:45 UTC (rev 35618)
+++ trunk/blender/source/blender/editors/space_action/action_ops.c      
2011-03-18 23:14:24 UTC (rev 35619)
@@ -95,9 +95,11 @@
        wmOperatorTypeMacro *otmacro;
        
        ot= WM_operatortype_append_macro("ACTION_OT_duplicate_move", 
"Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER);
-       WM_operatortype_macro_define(ot, "ACTION_OT_duplicate");
-       otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform");
-       RNA_int_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE);
+       if (ot) {
+               WM_operatortype_macro_define(ot, "ACTION_OT_duplicate");
+               otmacro= WM_operatortype_macro_define(ot, 
"TRANSFORM_OT_transform");
+                       RNA_int_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE);
+       }
        
 }
 

Modified: trunk/blender/source/blender/editors/space_graph/graph_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_graph/graph_ops.c        
2011-03-18 21:59:45 UTC (rev 35618)
+++ trunk/blender/source/blender/editors/space_graph/graph_ops.c        
2011-03-18 23:14:24 UTC (rev 35619)
@@ -276,10 +276,11 @@
        wmOperatorTypeMacro *otmacro;
        
        ot= WM_operatortype_append_macro("GRAPH_OT_duplicate_move", 
"Duplicate", OPTYPE_UNDO|OPTYPE_REGISTER);
-       WM_operatortype_macro_define(ot, "GRAPH_OT_duplicate");
-       otmacro= WM_operatortype_macro_define(ot, "TRANSFORM_OT_transform");
-       RNA_int_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE);
-
+       if (ot) {
+               WM_operatortype_macro_define(ot, "GRAPH_OT_duplicate");
+               otmacro= WM_operatortype_macro_define(ot, 
"TRANSFORM_OT_transform");
+                       RNA_int_set(otmacro->ptr, "mode", TFM_TIME_DUPLICATE);
+       }
 }
 
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs