diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-05-11 13:31:00 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-05-11 13:31:00 +0400 |
commit | 1e90add66cc4bc15faa1319b09280c987a33649d (patch) | |
tree | fdb96902535f3e7b74a885809a7325dcb3f24825 /source/blender | |
parent | b25496087351c9f458596f64abe2ba96a2316a9e (diff) |
more syncing with trunk.
Diffstat (limited to 'source/blender')
29 files changed, 53 insertions, 77 deletions
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 3f1c897b63f..6218dc9382c 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -57,7 +57,6 @@ #include "DNA_lattice_types.h" #include "DNA_scene_types.h" #include "DNA_text_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_action.h" @@ -2540,9 +2539,9 @@ static void locktrack_evaluate (bConstraint *con, bConstraintOb *cob, ListBase * } break; default: - { - unit_m3(totmat); - } + { + unit_m3(totmat); + } break; } /* Block to keep matrix heading */ diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 372eb1fe6f1..51f1cd61e7c 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -306,8 +306,7 @@ int modifier_isEnabled(struct Scene *scene, ModifierData *md, int required_mode) { ModifierTypeInfo *mti = modifierType_getInfo(md->type); - if (scene) - md->scene= scene; + md->scene= scene; if((md->mode & required_mode) != required_mode) return 0; if(mti->isDisabled && mti->isDisabled(md, required_mode == eModifierMode_Render)) return 0; diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index ce956fcb236..653e7612a17 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -44,7 +44,6 @@ #include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" #include "DNA_scene_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_editVert.h" #include "BLI_math.h" diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 704b0098cfa..506fcf7db78 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -533,7 +533,7 @@ static int ss_sync_from_derivedmesh(CCGSubSurf *ss, DerivedMesh *dm, for(i = 0; i < totedge; i++, me++) { CCGEdge *e; float crease; - + crease = useFlatSubdiv ? creaseFactor : me->crease * creaseFactor / 255.0f; @@ -1525,6 +1525,7 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, float (*partial_redraw_planes) int step = (fast)? gridSize-1: 1; ccgdm_pbvh_update(ccgdm); + if(ccgdm->pbvh && ccgdm->multires.mmd && !fast) { if(dm->numFaceData) { /* should be per face */ @@ -1539,8 +1540,6 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, float (*partial_redraw_planes) return; } - gridSize = ccgSubSurf_getGridSize(ss); - fi = ccgSubSurf_getFaceIterator(ss); for (; !ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) { CCGFace *f = ccgFaceIterator_getCurrent(fi); diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 14f6196017d..ddbbf64241f 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -3460,20 +3460,20 @@ static void direct_link_dverts(FileData *fd, int count, MDeformVert *mdverts) return; } - for (i=0; i<count; i++) { - void *tmp; - - mdverts[i].dw=newdataadr(fd, mdverts[i].dw); - + for (i= count; i > 0; i--, mdverts++) { /*convert to vgroup allocation system*/ - if (mdverts[i].dw) { - tmp = BLI_cellalloc_malloc(MEM_allocN_len(mdverts[i].dw), "vgroups from readfile.c"); - memcpy(tmp, mdverts[i].dw, MEM_allocN_len(mdverts[i].dw)); - - MEM_freeN(mdverts[i].dw); - mdverts[i].dw = tmp; - } else - mdverts[i].totweight=0; + MDeformWeight *dw; + if(mdverts->dw && (dw= newdataadr(fd, mdverts->dw))) { + const ssize_t dw_len= mdverts->totweight * sizeof(MDeformWeight); + void *dw_tmp= BLI_cellalloc_malloc(dw_len, "direct_link_dverts"); + memcpy(dw_tmp, dw, dw_len); + mdverts->dw= dw_tmp; + MEM_freeN(dw); + } + else { + mdverts->dw= NULL; + mdverts->totweight= 0; + } } } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index 07de3bf371b..7c1a20b13d1 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1122,16 +1122,16 @@ static void write_constraints(WriteData *wd, ListBase *conlist) of library blocks that implement this.*/ IDP_WriteProperty(data->prop, wd); } - break; + break; case CONSTRAINT_TYPE_SPLINEIK: { bSplineIKConstraint *data= (bSplineIKConstraint*)con->data; /* write points array */ writedata(wd, DATA, sizeof(float)*(data->numpoints), data->points); - } + } break; - } + } } /* Write the constraint */ diff --git a/source/blender/bmesh/operators/edgesplitop.c b/source/blender/bmesh/operators/edgesplitop.c index 9e82ea9e1ae..64e9a55fcc8 100644 --- a/source/blender/bmesh/operators/edgesplitop.c +++ b/source/blender/bmesh/operators/edgesplitop.c @@ -36,7 +36,6 @@ #include "BLI_array.h" #include "DNA_object_types.h" -#include "DNA_windowmanager_types.h" #include "ED_mesh.h" diff --git a/source/blender/bmesh/operators/mesh_conv.c b/source/blender/bmesh/operators/mesh_conv.c index ffa04edee48..efd038371e0 100644 --- a/source/blender/bmesh/operators/mesh_conv.c +++ b/source/blender/bmesh/operators/mesh_conv.c @@ -10,7 +10,6 @@ #include "DNA_key_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_windowmanager_types.h" #include "BKE_customdata.h" #include "BKE_mesh.h" diff --git a/source/blender/bmesh/operators/primitiveops.c b/source/blender/bmesh/operators/primitiveops.c index e05fe7fe3da..4e68e2ee5f8 100644 --- a/source/blender/bmesh/operators/primitiveops.c +++ b/source/blender/bmesh/operators/primitiveops.c @@ -4,7 +4,6 @@ #include "DNA_mesh_types.h" #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "DNA_windowmanager_types.h" #include "BLI_utildefines.h" diff --git a/source/blender/bmesh/operators/subdivideop.c b/source/blender/bmesh/operators/subdivideop.c index 25b9cd933f3..e537fbf5f6a 100644 --- a/source/blender/bmesh/operators/subdivideop.c +++ b/source/blender/bmesh/operators/subdivideop.c @@ -37,7 +37,6 @@ #include "BLI_utildefines.h" #include "DNA_object_types.h" -#include "DNA_windowmanager_types.h" #include "ED_mesh.h" diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c index 5763fcde705..c7d91a86ba5 100644 --- a/source/blender/editors/gpencil/gpencil_paint.c +++ b/source/blender/editors/gpencil/gpencil_paint.c @@ -50,7 +50,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" #include "DNA_gpencil_types.h" -#include "DNA_windowmanager_types.h" #include "UI_view2d.h" diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 1fb227de2b8..2ccfbd9fab1 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -40,6 +40,10 @@ struct Object; struct Scene; struct bContext; struct wmKeyConfig; +struct BMEditMesh; +struct BMLoop; +struct BMFace; +struct MTexPoly; /* uvedit_ops.c */ void ED_operatortypes_uvedit(void); diff --git a/source/blender/editors/mesh/bmesh_tools.c b/source/blender/editors/mesh/bmesh_tools.c index eae283ea9e0..c5aa3cabc3d 100644 --- a/source/blender/editors/mesh/bmesh_tools.c +++ b/source/blender/editors/mesh/bmesh_tools.c @@ -45,7 +45,6 @@ #include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "DNA_key_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_types.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/bmeshutils.c b/source/blender/editors/mesh/bmeshutils.c index fd97f08b3e7..23aa71f9a8e 100644 --- a/source/blender/editors/mesh/bmeshutils.c +++ b/source/blender/editors/mesh/bmeshutils.c @@ -45,7 +45,6 @@ #include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "DNA_key_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_types.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editbmesh_add.c b/source/blender/editors/mesh/editbmesh_add.c index 7093a6e3298..c5bd60bc478 100644 --- a/source/blender/editors/mesh/editbmesh_add.c +++ b/source/blender/editors/mesh/editbmesh_add.c @@ -45,7 +45,6 @@ #include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "DNA_key_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_types.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/editbmesh_bvh.c b/source/blender/editors/mesh/editbmesh_bvh.c index 1481b0a4cc2..f238f817d9d 100644 --- a/source/blender/editors/mesh/editbmesh_bvh.c +++ b/source/blender/editors/mesh/editbmesh_bvh.c @@ -47,7 +47,6 @@ #include "DNA_screen_types.h" #include "DNA_view3d_types.h" #include "DNA_key_types.h" -#include "DNA_windowmanager_types.h" #include "RNA_types.h" #include "RNA_define.h" diff --git a/source/blender/editors/mesh/knifetool.c b/source/blender/editors/mesh/knifetool.c index f702f1613c5..c39f88bf19b 100755 --- a/source/blender/editors/mesh/knifetool.c +++ b/source/blender/editors/mesh/knifetool.c @@ -37,7 +37,6 @@ #include "DNA_screen_types.h" #include "DNA_scene_types.h" #include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "DNA_object_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/mesh/loopcut.c b/source/blender/editors/mesh/loopcut.c index 7376b35d86b..3b7d21199ea 100644 --- a/source/blender/editors/mesh/loopcut.c +++ b/source/blender/editors/mesh/loopcut.c @@ -43,7 +43,6 @@ #include "DNA_screen_types.h" #include "DNA_scene_types.h" #include "DNA_userdef_types.h" -#include "DNA_windowmanager_types.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/editors/space_api/CMakeLists.txt b/source/blender/editors/space_api/CMakeLists.txt index 3977a47066c..64ad1f9c419 100644 --- a/source/blender/editors/space_api/CMakeLists.txt +++ b/source/blender/editors/space_api/CMakeLists.txt @@ -25,8 +25,6 @@ set(INC ../../blenloader ../../blenlib ../../bmesh - ../include - ../../../../intern/guardedalloc ../../makesdna ../../makesrna ../../windowmanager diff --git a/source/blender/editors/space_image/image_buttons.c b/source/blender/editors/space_image/image_buttons.c index e2ed39c423a..60c55375262 100644 --- a/source/blender/editors/space_image/image_buttons.c +++ b/source/blender/editors/space_image/image_buttons.c @@ -54,7 +54,6 @@ #include "BKE_mesh.h" #include "BKE_node.h" #include "BKE_screen.h" -#include "BKE_tessmesh.h" #include "RE_pipeline.h" diff --git a/source/blender/editors/space_image/image_draw.c b/source/blender/editors/space_image/image_draw.c index c123f40afe1..0f361b43de6 100644 --- a/source/blender/editors/space_image/image_draw.c +++ b/source/blender/editors/space_image/image_draw.c @@ -356,13 +356,13 @@ static void draw_image_grid(ARegion *ar, float zoomx, float zoomy) if(gridsize<=0.0f) return; if(gridsize<1.0f) { - while(gridsize<1.0f && gridsize<1000000.0f ) { + while(gridsize<1.0f) { gridsize*= 4.0f; gridstep*= 4.0f; } } else { - while(gridsize>=4.0f && gridsize<1000000.0f) { + while(gridsize>=4.0f) { gridsize/= 4.0f; gridstep/= 4.0f; } diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index 3be24ab65c3..17244a5251c 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -45,7 +45,6 @@ #include "DNA_node_types.h" #include "DNA_packedFile_types.h" #include "DNA_scene_types.h" -#include "DNA_meshdata_types.h" #include "BKE_colortools.h" #include "BKE_context.h" @@ -57,7 +56,6 @@ #include "BKE_packedFile.h" #include "BKE_report.h" #include "BKE_screen.h" -#include "BKE_tessmesh.h" #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" @@ -68,8 +66,6 @@ #include "RNA_define.h" #include "RNA_enum_types.h" -#include "bmesh.h" - #include "ED_image.h" #include "ED_render.h" #include "ED_screen.h" diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index ece0169cf59..2165f2faa5d 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -51,7 +51,6 @@ #include "BKE_image.h" #include "BKE_mesh.h" #include "BKE_screen.h" -#include "BKE_tessmesh.h" #include "IMB_imbuf_types.h" @@ -277,7 +276,7 @@ int ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit) return 0; if(obedit && obedit->type == OB_MESH) { - BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh; + struct BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh; int ret; ret = EDBM_texFaceCheck(em); @@ -295,7 +294,7 @@ int ED_space_image_show_uvshadow(SpaceImage *sima, Object *obedit) if(ED_space_image_show_paint(sima)) if(obedit && obedit->type == OB_MESH) { - BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh; + struct BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh; int ret; ret = EDBM_texFaceCheck(em); @@ -588,7 +587,7 @@ static void image_refresh(const bContext *C, ScrArea *UNUSED(sa)) if(ima && (ima->source==IMA_SRC_VIEWER || sima->pin)); else if(obedit && obedit->type == OB_MESH) { Mesh *me= (Mesh*)obedit->data; - BMEditMesh *em= me->edit_btmesh; + struct BMEditMesh *em= me->edit_btmesh; MTexPoly *tf; if(em && EDBM_texFaceCheck(em)) { @@ -1008,3 +1007,4 @@ void ED_spacetype_image(void) BKE_spacetype_register(st); } + diff --git a/source/blender/editors/space_logic/logic_buttons.c b/source/blender/editors/space_logic/logic_buttons.c index 474ab81cdf8..e894fd9cff5 100644 --- a/source/blender/editors/space_logic/logic_buttons.c +++ b/source/blender/editors/space_logic/logic_buttons.c @@ -31,8 +31,6 @@ #include <string.h> #include <stdio.h> -#include "DNA_meshdata_types.h" - #include "BLI_blenlib.h" #include "BLI_math.h" #include "BLI_utildefines.h" diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index c278646698f..f74a884eb50 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -1015,10 +1015,10 @@ static void v3d_editmetaball_buts(uiLayout *layout, Object *ob) // row= uiLayoutRow(layout, 0); RNA_pointer_create(&mball->id, &RNA_MetaElement, mball->lastelem, &ptr); - + col= uiLayoutColumn(layout, 0); uiItemR(col, &ptr, "co", 0, "Location", ICON_NONE); - + uiItemR(col, &ptr, "radius", 0, "Radius", ICON_NONE); uiItemR(col, &ptr, "stiffness", 0, "Stiffness", ICON_NONE); @@ -1080,7 +1080,7 @@ static void do_view3d_region_buttons(bContext *C, void *UNUSED(index), int event DAG_id_tag_update(&ob->id, OB_RECALC_OB); break; - + case B_OBJECTPANELMEDIAN: if(ob) { v3d_editvertex_buts(NULL, v3d, ob, 1.0); @@ -1278,7 +1278,7 @@ static void view3d_panel_object(const bContext *C, Panel *pa) else { v3d_transform_butsR(col, &obptr); - } + } } #if 0 diff --git a/source/blender/editors/space_view3d/view3d_select.c b/source/blender/editors/space_view3d/view3d_select.c index 1269342b3e0..b35e92995fa 100644 --- a/source/blender/editors/space_view3d/view3d_select.c +++ b/source/blender/editors/space_view3d/view3d_select.c @@ -93,7 +93,6 @@ void view3d_set_viewcontext(bContext *C, ViewContext *vc) vc->obedit= CTX_data_edit_object(C); } - int view3d_get_view_aligned_coordinate(ViewContext *vc, float fp[3], const short mval[2], const short do_fallback) { float dvec[3]; @@ -124,7 +123,6 @@ int view3d_get_view_aligned_coordinate(ViewContext *vc, float fp[3], const short } } - /* * ob == NULL if you want global matrices * */ @@ -689,10 +687,10 @@ static void do_lasso_select_armature(ViewContext *vc, short mcords[][2], short m change= TRUE; } if(lasso_inside(mcords, moves, sco2[0], sco2[1])) { - if(select) ebone->flag |= BONE_TIPSEL; - else ebone->flag &= ~BONE_TIPSEL; - didpoint= 1; - change= TRUE; + if(select) ebone->flag |= BONE_TIPSEL; + else ebone->flag &= ~BONE_TIPSEL; + didpoint= 1; + change= TRUE; } /* if one of points selected, we skip the bone itself */ if(didpoint==0 && lasso_inside_edge(mcords, moves, sco1[0], sco1[1], sco2[0], sco2[1])) { @@ -1047,7 +1045,7 @@ static Base *mouse_select_menu(bContext *C, ViewContext *vc, unsigned int *buffe /* we want a select buffer with bones, if there are... */ /* so check three selection levels and compare */ -static short mixed_bones_object_selectbuffer(ViewContext *vc, unsigned int *buffer, const short *mval) +static short mixed_bones_object_selectbuffer(ViewContext *vc, unsigned int *buffer, const short mval[2]) { rcti rect; int offs; @@ -1104,7 +1102,7 @@ static short mixed_bones_object_selectbuffer(ViewContext *vc, unsigned int *buff } /* returns basact */ -static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int hits, const short *mval, Base *startbase, int has_bones) +static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int hits, const short mval[2], Base *startbase, int has_bones) { Scene *scene= vc->scene; View3D *v3d= vc->v3d; @@ -1197,7 +1195,7 @@ static Base *mouse_select_eval_buffer(ViewContext *vc, unsigned int *buffer, int } /* mval comes from event->mval, only use within region handlers */ -Base *ED_view3d_give_base_under_cursor(bContext *C, const short *mval) +Base *ED_view3d_give_base_under_cursor(bContext *C, const short mval[2]) { ViewContext vc; Base *basact= NULL; @@ -1222,7 +1220,7 @@ Base *ED_view3d_give_base_under_cursor(bContext *C, const short *mval) } /* mval is region coords */ -static int mouse_select(bContext *C, const short *mval, short extend, short obcenter, short enumerate) +static int mouse_select(bContext *C, const short mval[2], short extend, short obcenter, short enumerate) { ViewContext vc; ARegion *ar= CTX_wm_region(C); @@ -1940,7 +1938,7 @@ static void mesh_circle_doSelectFace(void *userData, BMFace *efa, int x, int y, } } -static void mesh_circle_select(ViewContext *vc, int select, const short *mval, float rad) +static void mesh_circle_select(ViewContext *vc, int select, const short mval[2], float rad) { ToolSettings *ts= vc->scene->toolsettings; int bbsel; @@ -1985,7 +1983,7 @@ static void mesh_circle_select(ViewContext *vc, int select, const short *mval, f EDBM_selectmode_flush(vc->em); } -static void paint_facesel_circle_select(ViewContext *vc, int select, const short *mval, float rad) +static void paint_facesel_circle_select(ViewContext *vc, int select, const short mval[2], float rad) { Object *ob= vc->obact; Mesh *me = ob?ob->data:NULL; @@ -2032,7 +2030,7 @@ static void nurbscurve_circle_doSelect(void *userData, Nurb *UNUSED(nu), BPoint } } } -static void nurbscurve_circle_select(ViewContext *vc, int select, const short *mval, float rad) +static void nurbscurve_circle_select(ViewContext *vc, int select, const short mval[2], float rad) { struct {ViewContext *vc; short select, mval[2]; float radius; } data; @@ -2059,7 +2057,7 @@ static void latticecurve_circle_doSelect(void *userData, BPoint *bp, int x, int bp->f1 = data->select?(bp->f1|SELECT):(bp->f1&~SELECT); } } -static void lattice_circle_select(ViewContext *vc, int select, const short *mval, float rad) +static void lattice_circle_select(ViewContext *vc, int select, const short mval[2], float rad) { struct {ViewContext *vc; short select, mval[2]; float radius; } data; @@ -2091,7 +2089,7 @@ static short pchan_circle_doSelectJoint(void *userData, bPoseChannel *pchan, int } return 0; } -static void pose_circle_select(ViewContext *vc, int select, const short *mval, float rad) +static void pose_circle_select(ViewContext *vc, int select, const short mval[2], float rad) { struct {ViewContext *vc; short select, mval[2]; float radius; } data; bPose *pose = vc->obact->pose; @@ -2159,7 +2157,7 @@ static short armature_circle_doSelectJoint(void *userData, EditBone *ebone, int } return 0; } -static void armature_circle_select(ViewContext *vc, int select, const short *mval, float rad) +static void armature_circle_select(ViewContext *vc, int select, const short mval[2], float rad) { struct {ViewContext *vc; short select, mval[2]; float radius; } data; bArmature *arm= vc->obedit->data; @@ -2218,7 +2216,7 @@ static void armature_circle_select(ViewContext *vc, int select, const short *mva /** Callbacks for circle selection in Editmode */ -static void obedit_circle_select(ViewContext *vc, short select, const short *mval, float rad) +static void obedit_circle_select(ViewContext *vc, short select, const short mval[2], float rad) { switch(vc->obedit->type) { case OB_MESH: @@ -2254,7 +2252,7 @@ static int view3d_circle_select_exec(bContext *C, wmOperator *op) int select; select= (gesture_mode==GESTURE_MODAL_SELECT); - + if( CTX_data_edit_object(C) || paint_facesel_test(obact) || (obact && (obact->mode & (OB_MODE_PARTICLE_EDIT|OB_MODE_POSE))) ) { diff --git a/source/blender/modifiers/SConscript b/source/blender/modifiers/SConscript index 9f13aa15851..c1fb4ea61d0 100644 --- a/source/blender/modifiers/SConscript +++ b/source/blender/modifiers/SConscript @@ -22,4 +22,3 @@ if env['BF_NO_ELBEEM']: env.BlenderLib ( libname = 'bf_modifiers', sources = sources, includes = Split(incs), defines=defs, libtype=['core','player'], priority = [80, 40] ) - diff --git a/source/blender/windowmanager/WM_types.h b/source/blender/windowmanager/WM_types.h index 8a05c6b3fa8..c0d9c192ab2 100644 --- a/source/blender/windowmanager/WM_types.h +++ b/source/blender/windowmanager/WM_types.h @@ -202,7 +202,6 @@ typedef struct wmNotifier { #define ND_TRANSFORM_DONE (18<<16) #define ND_WORLD (92<<16) #define ND_LAYER_CONTENT (101<<16) -#define ND_LAYER_CONTENT (101<<16) /* NC_OBJECT Object */ #define ND_TRANSFORM (18<<16) diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index dc1ef324d61..d32a26549e7 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -261,7 +261,7 @@ static int wm_macro_modal(bContext *C, wmOperator *op, wmEvent *event) retval = opm->type->modal(C, opm, event); /* if this one is done but it's not the last operator in the macro */ - if (opm->next && (retval & OPERATOR_FINISHED)) { + if ((retval & OPERATOR_FINISHED) && opm->next) { MacroData *md = op->customdata; md->retval = OPERATOR_FINISHED; /* keep in mind that at least one operator finished */ |