Revision: 16092
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16092
Author: nicholasbishop
Date: 2008-08-14 01:53:28 +0200 (Thu, 14 Aug 2008)
Log Message:
-----------
Removed a bunch of references to the old multires.
Note: python needs updating to work with the new multires. For now, I've just
been commenting out the python multires stuff with #warnings
Modified Paths:
--------------
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-nicholasbishop/source/blender/include/multires.h
branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mesh.c
branches/soc-2008-nicholasbishop/source/blender/render/intern/source/convertblender.c
branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
branches/soc-2008-nicholasbishop/source/blender/src/multires.c
Modified:
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
---
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/subsurf_ccg.c
2008-08-13 23:36:23 UTC (rev 16091)
+++
branches/soc-2008-nicholasbishop/source/blender/blenkernel/intern/subsurf_ccg.c
2008-08-13 23:53:28 UTC (rev 16092)
@@ -64,8 +64,6 @@
#include "CCGSubSurf.h"
-#include "multires.h"
-
typedef struct _VertData {
float co[3];
float no[3];
Modified: branches/soc-2008-nicholasbishop/source/blender/include/multires.h
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/include/multires.h
2008-08-13 23:36:23 UTC (rev 16091)
+++ branches/soc-2008-nicholasbishop/source/blender/include/multires.h
2008-08-13 23:53:28 UTC (rev 16092)
@@ -30,30 +30,8 @@
#ifndef MULTIRES_H
#define MULTIRES_H
-struct CustomData;
-struct EditMesh;
-struct Object;
-struct MDeformVert;
-struct Mesh;
-struct MultiresLevel;
-struct Multires;
-struct uiBlock;
-
/* For canceling operations that don't work with multires on or on a non-base
level */
int multires_test();
int multires_level1_test();
-void multires_draw_interface(struct uiBlock *block, unsigned short cx,
unsigned short cy);
-
-void multires_make(void *ob, void *me);
-void multires_delete(void *ob, void *me);
-void multires_level_to_editmesh(struct Object *ob, struct Mesh *me, const int
render);
-void multires_finish_mesh_update(struct Object *ob);
-void multires_subdivide(void *ob, void *me);
-void multires_del_lower(void *ob, void *me);
-void multires_del_higher(void *ob, void *me);
-void multires_set_level_cb(void *ob, void *me);
-void multires_edge_level_update_cb(void *ob, void *me);
-int multires_modifier_warning();
-
#endif
Modified: branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mesh.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mesh.c
2008-08-13 23:36:23 UTC (rev 16091)
+++ branches/soc-2008-nicholasbishop/source/blender/python/api2_2x/Mesh.c
2008-08-13 23:53:28 UTC (rev 16092)
@@ -87,7 +87,6 @@
#include "constant.h"
#include "gen_utils.h"
#include "gen_library.h"
-#include "multires.h"
/* EXPP Mesh defines */
@@ -7157,19 +7156,20 @@
"value out of range" );
switch (GET_INT_FROM_POINTER(type)) {
+#warning "Python needs to be updated to work with the new multires."
case MESH_MULTIRES_LEVEL:
- self->mesh->mr->newlvl = i;
- multires_set_level_cb(self->object, self->mesh);
+ /*self->mesh->mr->newlvl = i;
+ multires_set_level_cb(self->object, self->mesh);*/
break;
case MESH_MULTIRES_EDGE:
- self->mesh->mr->edgelvl = i;
- multires_edge_level_update(self->object, self->mesh);
+ /*self->mesh->mr->edgelvl = i;
+ multires_edge_level_update(self->object, self->mesh);*/
break;
case MESH_MULTIRES_PIN:
- self->mesh->mr->pinlvl = i;
+ /*self->mesh->mr->pinlvl = i;*/
break;
case MESH_MULTIRES_RENDER:
- self->mesh->mr->renderlvl = i;
+ /*self->mesh->mr->renderlvl = i;*/
break;
}
@@ -8061,14 +8061,14 @@
if( !param ) {
if ( mesh->mr ) {
- multires_delete(self->object, mesh);
+ /*multires_delete(self->object, mesh);*/
}
} else {
if ( !mesh->mr ) {
if (mesh->key)
return EXPP_ReturnIntError(
PyExc_RuntimeError,
"Cannot enable multires for a
mesh with shape keys" );
- multires_make(self->object, mesh);
+ /*multires_make(self->object, mesh);*/
}
}
return 0;
Modified:
branches/soc-2008-nicholasbishop/source/blender/render/intern/source/convertblender.c
===================================================================
---
branches/soc-2008-nicholasbishop/source/blender/render/intern/source/convertblender.c
2008-08-13 23:36:23 UTC (rev 16091)
+++
branches/soc-2008-nicholasbishop/source/blender/render/intern/source/convertblender.c
2008-08-13 23:53:28 UTC (rev 16092)
@@ -100,7 +100,6 @@
#include "IMB_imbuf_types.h"
#include "envmap.h"
-#include "multires.h"
#include "occlusion.h"
#include "render_types.h"
#include "rendercore.h"
Modified: branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
2008-08-13 23:36:23 UTC (rev 16091)
+++ branches/soc-2008-nicholasbishop/source/blender/src/buttons_editing.c
2008-08-13 23:53:28 UTC (rev 16092)
@@ -736,14 +736,7 @@
rndlayerdata = data->layers[CustomData_get_render_layer_index(data,
type)].data;
CustomData_set_layer_active(data, type, layer - &data->layers[index]);
- /* Multires is handled seperately because the display data is separate
- from the data stored in multires */
- if(me && me->mr) {
- multires_delete_layer(me, &me->mr->fdata, type, layer -
&data->layers[index]);
- multires_level_to_editmesh(OBACT, me, 0);
- multires_finish_mesh_update(OBACT);
- }
- else if(G.obedit) {
+ if(G.obedit) {
EM_free_data_layer(data, type);
}
else if(me) {
@@ -4789,13 +4782,7 @@
break;
case B_NEWTFACE:
- if(me && me->mr) {
- layernum=
CustomData_number_of_layers(&me->fdata, CD_MTFACE);
- multires_add_layer(me, &me->mr->fdata,
CD_MTFACE, layernum);
- multires_level_to_editmesh(ob, me, 0);
- multires_finish_mesh_update(ob);
- }
- else if(G.obedit) {
+ if(G.obedit) {
layernum=
CustomData_number_of_layers(&em->fdata, CD_MTFACE);
EM_add_data_layer(&em->fdata, CD_MTFACE);
CustomData_set_layer_active(&em->fdata,
CD_MTFACE, layernum);
@@ -4826,10 +4813,6 @@
CustomData_set_layer_active(fdata, CD_MTFACE,
acttface-1);
mesh_update_customdata_pointers(me);
- /* Update first-level face data in multires */
- if(me && me->mr && me->mr->current != 1)
-
CustomData_set_layer_active(&me->mr->fdata, CD_MTFACE, acttface-1);
-
DAG_object_flush_update(G.scene, ob,
OB_RECALC_DATA);
BIF_undo_push("Set Active UV Texture");
allqueue(REDRAWVIEW3D, 0);
Modified: branches/soc-2008-nicholasbishop/source/blender/src/multires.c
===================================================================
--- branches/soc-2008-nicholasbishop/source/blender/src/multires.c
2008-08-13 23:36:23 UTC (rev 16091)
+++ branches/soc-2008-nicholasbishop/source/blender/src/multires.c
2008-08-13 23:53:28 UTC (rev 16092)
@@ -79,8 +79,6 @@
#include <math.h>
-void multires_calc_temp_data(struct MultiresLevel *lvl);
-
int multires_test()
{
Mesh *me= get_mesh(OBACT);
@@ -107,303 +105,3 @@
if(G.f & G_SCULPTMODE && !G.obedit)
sculptmode_correct_state();
}
-
-static void medge_flag_to_eed(const short flag, const char crease, EditEdge
*eed)
-{
- if(!eed) return;
-
- if(flag & ME_SEAM) eed->seam= 1;
- if(flag & ME_SHARP) eed->sharp = 1;
- if(flag & SELECT) eed->f |= SELECT;
- if(flag & ME_FGON) eed->h= EM_FGON;
- if(flag & ME_HIDE) eed->h |= 1;
-
- eed->crease= ((float)crease)/255.0;
-}
-
-void multires_level_to_editmesh(Object *ob, Mesh *me, const int render)
-{
- MultiresLevel *lvl= BLI_findlink(&me->mr->levels,me->mr->current-1);
- int i;
- EditMesh *em= (!render && G.obedit) ? G.editMesh : NULL;
- EditVert **eves= NULL;
- EditEdge *eed= NULL;
-
- if(em) {
- /* Remove editmesh elements */
- free_editMesh(em);
-
- eves= MEM_callocN(sizeof(EditVert*)*lvl->totvert, "editvert
pointers");
-
- /* Vertices/Edges/Faces */
- for(i=0; i<lvl->totvert; ++i) {
- eves[i]= addvertlist(me->mr->verts[i].co, NULL);
- if(me->mr->verts[i].flag & 1) eves[i]->f |= SELECT;
- if(me->mr->verts[i].flag & ME_HIDE) eves[i]->h= 1;
- eves[i]->data= NULL;
- }
- for(i=0; i<lvl->totedge; ++i) {
- addedgelist(eves[lvl->edges[i].v[0]],
eves[lvl->edges[i].v[1]], NULL);
- }
- for(i=0; i<lvl->totface; ++i) {
- EditVert *eve4= lvl->faces[i].v[3] ?
eves[lvl->faces[i].v[3]] : NULL;
- EditFace *efa= addfacelist(eves[lvl->faces[i].v[0]],
eves[lvl->faces[i].v[1]],
- eves[lvl->faces[i].v[2]],
eve4, NULL, NULL);
- efa->flag= lvl->faces[i].flag & ~ME_HIDE;
- efa->mat_nr= lvl->faces[i].mat_nr;
- if(lvl->faces[i].flag & ME_FACE_SEL)
- efa->f |= SELECT;
- if(lvl->faces[i].flag & ME_HIDE) efa->h= 1;
- efa->data= NULL;
- }
-
- /* Edge flags */
- eed= em->edges.first;
- if(lvl==me->mr->levels.first) {
- for(i=0; i<lvl->totedge; ++i) {
- medge_flag_to_eed(me->mr->edge_flags[i],
me->mr->edge_creases[i], eed);
- eed= eed->next;
- }
- } else {
- MultiresLevel *lvl1= me->mr->levels.first;
- const int last= lvl1->totedge * pow(2,
me->mr->current-1);
- for(i=0; i<last; ++i) {
- const int ndx= i / pow(2, me->mr->current-1);
-
- medge_flag_to_eed(me->mr->edge_flags[ndx],
me->mr->edge_creases[ndx], eed);
- eed= eed->next;
- }
- }
-
- eed= em->edges.first;
- for(i=0, eed= em->edges.first; i<lvl->totedge; ++i, eed=
eed->next) {
- eed->h= me->mr->verts[lvl->edges[i].v[0]].flag &
ME_HIDE ||
- me->mr->verts[lvl->edges[i].v[1]].flag &
ME_HIDE;
- }
-
- EM_select_flush();
-
- multires_customdata_to_mesh(me, em, lvl, &me->mr->vdata, em ?
&em->vdata : &me->vdata, CD_MDEFORMVERT);
- multires_customdata_to_mesh(me, em, lvl, &me->mr->fdata, em ?
&em->fdata : &me->fdata, CD_MTFACE);
-
- /* Colors */
- if(me->mr->use_col) {
- MCol c[4];
- EditFace *efa= NULL;
- CustomData *src= &em->fdata;
-
- if(me->mr->use_col) EM_add_data_layer(src, CD_MCOL);
- efa= em->faces.first;
-
- for(i=0; i<lvl->totface; ++i) {
- if(me->mr->use_col) {
- multires_to_mcol(&lvl->colfaces[i], c);
- CustomData_em_set(src, efa->data,
CD_MCOL, c);
- }
- efa= efa->next;
- }
-
- }
-
- mesh_update_customdata_pointers(me);
-
- MEM_freeN(eves);
- DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA);
- recalc_editnormals();
- }
-}
-
-void multires_make(void *ob, void *me_v)
-{
- Mesh *me= me_v;
- Key *key;
-
- /* Check for shape keys */
- key= me->key;
- if(key) {
- int ret= okee("Adding multires will delete all shape keys,
proceed?");
- if(ret) {
- free_key(key);
- me->key= NULL;
- } else
- return;
- }
-
- waitcursor(1);
-
- multires_check_state();
-
- multires_create(ob, me);
-
- allqueue(REDRAWBUTSEDIT, 0);
- BIF_undo_push("Make multires");
- waitcursor(0);
-}
-
-void multires_delete(void *ob, void *me_v)
-{
- Mesh *me= me_v;
- multires_free(me->mr);
- me->mr= NULL;
-
- multires_check_state();
-
- allqueue(REDRAWBUTSEDIT, 0);
-
- BIF_undo_push("Apply multires");
-}
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
