[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59717] branches/soc-2013-ui_replay/source /blender/windowmanager/intern/wm_operators.c: Fixed another strict compilation error, mixed declarations and code.

Vincent Akkermans vincent at ack-err.net
Sun Sep 1 17:58:54 CEST 2013


Revision: 59717
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59717
Author:   ack-err
Date:     2013-09-01 15:58:53 +0000 (Sun, 01 Sep 2013)
Log Message:
-----------
Fixed another strict compilation error, mixed declarations and code.

Modified Paths:
--------------
    branches/soc-2013-ui_replay/source/blender/windowmanager/intern/wm_operators.c

Modified: branches/soc-2013-ui_replay/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- branches/soc-2013-ui_replay/source/blender/windowmanager/intern/wm_operators.c	2013-09-01 15:51:21 UTC (rev 59716)
+++ branches/soc-2013-ui_replay/source/blender/windowmanager/intern/wm_operators.c	2013-09-01 15:58:53 UTC (rev 59717)
@@ -4161,13 +4161,14 @@
 	if (ar && arg1)
 	{
 		wmOperatorType *ot = (wmOperatorType*)arg1;
+		OperatorListItem *oli;
 		
 		if (BLI_findstring(&ar->operators, ot->idname, offsetof(OperatorListItem, optype_idname))) {
 			BKE_reportf(&wm->reports, RPT_INFO, "This operator (%s) is already present in the menubar.", ot->idname);
 			return;
 		}
 		
-		OperatorListItem *oli = MEM_callocN(sizeof(OperatorListItem), "add operator list item to icon shelf");
+		oli = MEM_callocN(sizeof(OperatorListItem), "add operator list item to icon shelf");
 
 		BLI_strncpy(oli->optype_idname, ot->idname, OP_MAX_TYPENAME);
 		BLI_strncpy(oli->context, CTX_data_mode_string(C), MAX_NAME);
@@ -4186,7 +4187,6 @@
 	PropertyRNA *prop;
 	wmOperatorType *optype = (wmOperatorType*)arg1;
 	
-	
 	ar = BKE_area_find_region_type(sa, RGN_TYPE_TOOLS);
 	
 	if (ar == NULL) return;




More information about the Bf-blender-cvs mailing list