[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17706] branches/blender2.5/blender/source /blender: 2.5 - compile fixes for Elubie's commit

Joshua Leung aligorith at gmail.com
Wed Dec 3 23:35:38 CET 2008


Revision: 17706
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17706
Author:   aligorith
Date:     2008-12-03 23:35:38 +0100 (Wed, 03 Dec 2008)

Log Message:
-----------
2.5 - compile fixes for Elubie's commit

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/view2d.c
    branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2008-12-03 21:18:10 UTC (rev 17705)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2008-12-03 22:35:38 UTC (rev 17706)
@@ -42,6 +42,8 @@
 #include "BIF_gl.h"
 #include "BIF_glutil.h"
 
+#include "ED_screen.h"
+
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
@@ -363,17 +365,7 @@
 /* Restore view matrices after drawing */
 void UI_view2d_view_restore(const bContext *C)
 {
-	ARegion *region= C->region;
-	int winx, winy;
-	
-	/* calculate extents of region */
-	winx= region->winrct.xmax - region->winrct.xmin;
-	winy= region->winrct.ymax - region->winrct.ymin;
-	
-	/* set default region matrix - pixel offsets (0.375) for 1:1 correspondance are not applied, 
-	 * as they were causing some unwanted offsets when drawing 
-	 */
-	wmOrtho2(C->window, 0, winx, 0, winy);
+	ED_region_pixelspace(C, C->region);
 }
 
 /* *********************************************************************** */

Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c	2008-12-03 21:18:10 UTC (rev 17705)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c	2008-12-03 22:35:38 UTC (rev 17706)
@@ -56,7 +56,7 @@
 	RNA_def_property_ui_text(prop, "CurrentValue", "Current Value.");
 
 	prop= RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_sdna(prop, NULL, "type", 0);
+	RNA_def_property_enum_sdna(prop, NULL, "type");
 	RNA_def_property_enum_items(prop, prop_keyblock_type_items);
 	RNA_def_property_ui_text(prop, "Type", "");
 





More information about the Bf-blender-cvs mailing list