[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14639] branches/apricot/source: moved snap button to ground into header until it can be integrated with snap or put elsewhere .
Campbell Barton
ideasman42 at gmail.com
Thu May 1 15:02:16 CEST 2008
Revision: 14639
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14639
Author: campbellbarton
Date: 2008-05-01 15:02:16 +0200 (Thu, 01 May 2008)
Log Message:
-----------
moved snap button to ground into header until it can be integrated with snap or put elsewhere.
needed to move KX_BlenderGL.cpp include to compile
Modified Paths:
--------------
branches/apricot/source/blender/src/buttons_editing.c
branches/apricot/source/blender/src/header_view3d.c
branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
Modified: branches/apricot/source/blender/src/buttons_editing.c
===================================================================
--- branches/apricot/source/blender/src/buttons_editing.c 2008-05-01 12:35:21 UTC (rev 14638)
+++ branches/apricot/source/blender/src/buttons_editing.c 2008-05-01 13:02:16 UTC (rev 14639)
@@ -875,8 +875,6 @@
uiButSetFunc(but,retopo_do_all_cb,ob,me);
}
uiBlockEndAlign(block);
- } else {
- but= uiDefButBitC(block,TOG,RETOPO,B_NOP, "Ground Snap", 10,130,170,19, &G.scene->toolsettings->retopo_mode, 0,0,0,0, ""); /* APRICOT HACK*/
}
uiBlockBeginAlign(block);
Modified: branches/apricot/source/blender/src/header_view3d.c
===================================================================
--- branches/apricot/source/blender/src/header_view3d.c 2008-05-01 12:35:21 UTC (rev 14638)
+++ branches/apricot/source/blender/src/header_view3d.c 2008-05-01 13:02:16 UTC (rev 14639)
@@ -5704,7 +5704,11 @@
uiBlockEndAlign(block);
xco+= 10;
}
-
+
+ /* APRICOT HACK */
+ uiDefIconButBitC(block, TOG, RETOPO, B_NOP, ICON_PROPEDIT,xco,0,XIC,YIC, &G.scene->toolsettings->retopo_mode, 0, 0, 0, 0, "Snap to surface");
+ xco+= XIC+10;
+
/* selection modus */
if(G.obedit && (G.obedit->type == OB_MESH)) {
uiBlockBeginAlign(block);
Modified: branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
===================================================================
--- branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp 2008-05-01 12:35:21 UTC (rev 14638)
+++ branches/apricot/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp 2008-05-01 13:02:16 UTC (rev 14639)
@@ -32,6 +32,8 @@
#include <config.h>
#endif
+#include "BIF_gl.h"
+
/*
* This little block needed for linking to Blender...
*/
@@ -77,7 +79,7 @@
#include "BKE_bmfont.h"
#include "BKE_image.h"
-#include "BIF_gl.h"
+
extern "C" {
#include "BDR_drawmesh.h"
#include "BIF_mywindow.h"
More information about the Bf-blender-cvs
mailing list