Revision: 18330
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18330
Author: nicholasbishop
Date: 2009-01-05 02:58:58 +0100 (Mon, 05 Jan 2009)
Log Message:
-----------
Everything in the branch should once again compile.
Modified Paths:
--------------
branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mesh.c
branches/soc-2008-nicholasbishop/source/blender/src/header_view3d.c
Modified: branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mesh.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mesh.c
2009-01-05 00:38:17 UTC (rev 18329)
+++ branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mesh.c
2009-01-05 01:58:58 UTC (rev 18330)
@@ -57,7 +57,6 @@
#include "BKE_mesh.h"
#include "BKE_material.h"
#include "BKE_main.h"
-#include "BKE_multires.h"
#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_DerivedMesh.h"
@@ -87,7 +86,6 @@
#include "constant.h"
#include "gen_utils.h"
#include "gen_library.h"
-#include "multires.h"
/* EXPP Mesh defines */
@@ -6840,10 +6838,6 @@
char *type = NULL;
short typenum;
- if (mesh->mr)
- return EXPP_ReturnPyObjError( PyExc_RuntimeError,
- "Shape Keys cannot be added to
meshes with multires" );
-
if( !PyArg_ParseTuple( args, "|is", &fra, &type ) )
return EXPP_ReturnPyObjError( PyExc_TypeError,
"expected nothing or an int and
optionally a string as arguments" );
@@ -7092,19 +7086,20 @@
/* multires */
static PyObject *Mesh_getMultiresLevelCount( BPy_Mesh * self )
{
- int i;
+ /*int i;
if (!self->mesh->mr)
i=0;
else
i= self->mesh->mr->level_count;
- return PyInt_FromLong(i);
+ return PyInt_FromLong(i);*/
+ return NULL;
}
static PyObject *Mesh_getMultires( BPy_Mesh * self, void *type )
{
- int i=0;
+ /*int i=0;
if (self->mesh->mr) {
switch (GET_INT_FROM_POINTER(type)) {
case MESH_MULTIRES_LEVEL:
@@ -7122,12 +7117,13 @@
}
}
- return PyInt_FromLong(i);
+ return PyInt_FromLong(i);*/
+ return NULL;
}
static int Mesh_setMultires( BPy_Mesh * self, PyObject *value, void *type )
{
- int i;
+ /*int i;
if( !PyInt_Check( value ) )
return EXPP_ReturnIntError( PyExc_TypeError,
"expected integer argument" );
@@ -7165,14 +7161,14 @@
case MESH_MULTIRES_RENDER:
self->mesh->mr->renderlvl = i;
break;
- }
+ }*/
return 0;
}
static PyObject *Mesh_addMultiresLevel( BPy_Mesh * self, PyObject * args )
{
- char typenum;
+ /*char typenum;
int i, levels = 1;
char *type = NULL;
if( G.obedit )
@@ -7197,7 +7193,8 @@
multires_update_levels(self->mesh, 0);
multires_level_to_editmesh(self->object, self->mesh, 0);
multires_finish_mesh_update(self->object);
- Py_RETURN_NONE;
+ Py_RETURN_NONE;*/
+ return NULL;
}
/* end multires */
@@ -8043,7 +8040,7 @@
}
}
return 0;
- case MESH_HASMULTIRES:
+ /*case MESH_HASMULTIRES:
if (!self->object)
return EXPP_ReturnIntError( PyExc_RuntimeError,
"This mesh must be linked to an object" );
@@ -8060,7 +8057,7 @@
multires_make(self->object, mesh);
}
}
- return 0;
+ return 0;*/
default:
return EXPP_ReturnIntError( PyExc_RuntimeError,
"couldn't get attribute" );
Modified: branches/soc-2008-nicholasbishop/source/blender/src/header_view3d.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/header_view3d.c
2009-01-05 00:38:17 UTC (rev 18329)
+++ branches/soc-2008-nicholasbishop/source/blender/src/header_view3d.c
2009-01-05 01:58:58 UTC (rev 18330)
@@ -2791,10 +2791,8 @@
editmesh_mark_seam(1);
break;
case 9: /* Crease SubSurf */
- if(!multires_level1_test()) {
- initTransform(TFM_CREASE, CTX_EDGE);
- Transform();
- }
+ initTransform(TFM_CREASE, CTX_EDGE);
+ Transform();
break;
case 10: /* Rotate Edge */
edge_rotate_selected(2);
@@ -2827,10 +2825,8 @@
DAG_object_flush_update(G.scene, G.obedit, OB_RECALC_DATA);
break;
case 17: /* Adjust Bevel Weight */
- if(!multires_level1_test()) {
- initTransform(TFM_BWEIGHT, CTX_EDGE);
- Transform();
- }
+ initTransform(TFM_BWEIGHT, CTX_EDGE);
+ Transform();
break;
}
allqueue(REDRAWVIEW3D, 0);
@@ -3256,10 +3252,8 @@
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
- /* PITA but we should let users know that automerge cant work with
multires :/ */
uiDefIconTextBut(block, BUTM, 1,
- G.scene->automerge ? ICON_CHECKBOX_HLT :
ICON_CHECKBOX_DEHLT,
- ((Mesh*)G.obedit->data)->mr ? "AutoMerge Editing
(disabled by multires)" : "AutoMerge Editing",
+ G.scene->automerge ? ICON_CHECKBOX_HLT :
ICON_CHECKBOX_DEHLT, "AutoMerge Editing",
0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 13, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6,
menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
