more syncing with trunk.

This commit is contained in:
Campbell Barton 2011-05-11 09:31:00 +00:00
parent b254960873
commit 1e90add66c
31 changed files with 53 additions and 86 deletions

@ -36,14 +36,6 @@
#include "GHOST_IEvent.h" #include "GHOST_IEvent.h"
/* INTEGER CODES */
#if defined(__sgi) || defined (__sparc) || defined (__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__hppa__) || defined (__BIG_ENDIAN__)
/* Big Endian */
#define MAKE_ID(a,b,c,d) ( (int)(a)<<24 | (int)(b)<<16 | (c)<<8 | (d) )
#else
/* Little Endian */
#define MAKE_ID(a,b,c,d) ( (int)(d)<<24 | (int)(c)<<16 | (b)<<8 | (a) )
#endif
/** /**
* Base class for events received the operating system. * Base class for events received the operating system.

@ -57,7 +57,6 @@
#include "DNA_lattice_types.h" #include "DNA_lattice_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_text_types.h" #include "DNA_text_types.h"
#include "DNA_windowmanager_types.h"
#include "BKE_action.h" #include "BKE_action.h"

@ -306,7 +306,6 @@ int modifier_isEnabled(struct Scene *scene, ModifierData *md, int required_mode)
{ {
ModifierTypeInfo *mti = modifierType_getInfo(md->type); ModifierTypeInfo *mti = modifierType_getInfo(md->type);
if (scene)
md->scene= scene; md->scene= scene;
if((md->mode & required_mode) != required_mode) return 0; if((md->mode & required_mode) != required_mode) return 0;

@ -44,7 +44,6 @@
#include "DNA_meshdata_types.h" #include "DNA_meshdata_types.h"
#include "DNA_mesh_types.h" #include "DNA_mesh_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_windowmanager_types.h"
#include "BLI_editVert.h" #include "BLI_editVert.h"
#include "BLI_math.h" #include "BLI_math.h"

@ -1525,6 +1525,7 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, float (*partial_redraw_planes)
int step = (fast)? gridSize-1: 1; int step = (fast)? gridSize-1: 1;
ccgdm_pbvh_update(ccgdm); ccgdm_pbvh_update(ccgdm);
if(ccgdm->pbvh && ccgdm->multires.mmd && !fast) { if(ccgdm->pbvh && ccgdm->multires.mmd && !fast) {
if(dm->numFaceData) { if(dm->numFaceData) {
/* should be per face */ /* should be per face */
@ -1539,8 +1540,6 @@ static void ccgDM_drawFacesSolid(DerivedMesh *dm, float (*partial_redraw_planes)
return; return;
} }
gridSize = ccgSubSurf_getGridSize(ss);
fi = ccgSubSurf_getFaceIterator(ss); fi = ccgSubSurf_getFaceIterator(ss);
for (; !ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) { for (; !ccgFaceIterator_isStopped(fi); ccgFaceIterator_next(fi)) {
CCGFace *f = ccgFaceIterator_getCurrent(fi); CCGFace *f = ccgFaceIterator_getCurrent(fi);

@ -3460,20 +3460,20 @@ static void direct_link_dverts(FileData *fd, int count, MDeformVert *mdverts)
return; return;
} }
for (i=0; i<count; i++) { for (i= count; i > 0; i--, mdverts++) {
void *tmp;
mdverts[i].dw=newdataadr(fd, mdverts[i].dw);
/*convert to vgroup allocation system*/ /*convert to vgroup allocation system*/
if (mdverts[i].dw) { MDeformWeight *dw;
tmp = BLI_cellalloc_malloc(MEM_allocN_len(mdverts[i].dw), "vgroups from readfile.c"); if(mdverts->dw && (dw= newdataadr(fd, mdverts->dw))) {
memcpy(tmp, mdverts[i].dw, MEM_allocN_len(mdverts[i].dw)); const ssize_t dw_len= mdverts->totweight * sizeof(MDeformWeight);
void *dw_tmp= BLI_cellalloc_malloc(dw_len, "direct_link_dverts");
MEM_freeN(mdverts[i].dw); memcpy(dw_tmp, dw, dw_len);
mdverts[i].dw = tmp; mdverts->dw= dw_tmp;
} else MEM_freeN(dw);
mdverts[i].totweight=0; }
else {
mdverts->dw= NULL;
mdverts->totweight= 0;
}
} }
} }

@ -36,7 +36,6 @@
#include "BLI_array.h" #include "BLI_array.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_windowmanager_types.h"
#include "ED_mesh.h" #include "ED_mesh.h"

@ -10,7 +10,6 @@
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_windowmanager_types.h"
#include "BKE_customdata.h" #include "BKE_customdata.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"

@ -4,7 +4,6 @@
#include "DNA_mesh_types.h" #include "DNA_mesh_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_windowmanager_types.h"
#include "BLI_utildefines.h" #include "BLI_utildefines.h"

@ -37,7 +37,6 @@
#include "BLI_utildefines.h" #include "BLI_utildefines.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_windowmanager_types.h"
#include "ED_mesh.h" #include "ED_mesh.h"

@ -50,7 +50,6 @@
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_gpencil_types.h" #include "DNA_gpencil_types.h"
#include "DNA_windowmanager_types.h"
#include "UI_view2d.h" #include "UI_view2d.h"

@ -40,6 +40,10 @@ struct Object;
struct Scene; struct Scene;
struct bContext; struct bContext;
struct wmKeyConfig; struct wmKeyConfig;
struct BMEditMesh;
struct BMLoop;
struct BMFace;
struct MTexPoly;
/* uvedit_ops.c */ /* uvedit_ops.c */
void ED_operatortypes_uvedit(void); void ED_operatortypes_uvedit(void);

@ -45,7 +45,6 @@
#include "DNA_screen_types.h" #include "DNA_screen_types.h"
#include "DNA_view3d_types.h" #include "DNA_view3d_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_windowmanager_types.h"
#include "RNA_types.h" #include "RNA_types.h"
#include "RNA_define.h" #include "RNA_define.h"

@ -45,7 +45,6 @@
#include "DNA_screen_types.h" #include "DNA_screen_types.h"
#include "DNA_view3d_types.h" #include "DNA_view3d_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_windowmanager_types.h"
#include "RNA_types.h" #include "RNA_types.h"
#include "RNA_define.h" #include "RNA_define.h"

@ -45,7 +45,6 @@
#include "DNA_screen_types.h" #include "DNA_screen_types.h"
#include "DNA_view3d_types.h" #include "DNA_view3d_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_windowmanager_types.h"
#include "RNA_types.h" #include "RNA_types.h"
#include "RNA_define.h" #include "RNA_define.h"

@ -47,7 +47,6 @@
#include "DNA_screen_types.h" #include "DNA_screen_types.h"
#include "DNA_view3d_types.h" #include "DNA_view3d_types.h"
#include "DNA_key_types.h" #include "DNA_key_types.h"
#include "DNA_windowmanager_types.h"
#include "RNA_types.h" #include "RNA_types.h"
#include "RNA_define.h" #include "RNA_define.h"

@ -37,7 +37,6 @@
#include "DNA_screen_types.h" #include "DNA_screen_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_userdef_types.h" #include "DNA_userdef_types.h"
#include "DNA_windowmanager_types.h"
#include "DNA_object_types.h" #include "DNA_object_types.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"

@ -43,7 +43,6 @@
#include "DNA_screen_types.h" #include "DNA_screen_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_userdef_types.h" #include "DNA_userdef_types.h"
#include "DNA_windowmanager_types.h"
#include "MEM_guardedalloc.h" #include "MEM_guardedalloc.h"

@ -25,8 +25,6 @@ set(INC
../../blenloader ../../blenloader
../../blenlib ../../blenlib
../../bmesh ../../bmesh
../include
../../../../intern/guardedalloc
../../makesdna ../../makesdna
../../makesrna ../../makesrna
../../windowmanager ../../windowmanager

@ -54,7 +54,6 @@
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_node.h" #include "BKE_node.h"
#include "BKE_screen.h" #include "BKE_screen.h"
#include "BKE_tessmesh.h"
#include "RE_pipeline.h" #include "RE_pipeline.h"

@ -356,13 +356,13 @@ static void draw_image_grid(ARegion *ar, float zoomx, float zoomy)
if(gridsize<=0.0f) return; if(gridsize<=0.0f) return;
if(gridsize<1.0f) { if(gridsize<1.0f) {
while(gridsize<1.0f && gridsize<1000000.0f ) { while(gridsize<1.0f) {
gridsize*= 4.0f; gridsize*= 4.0f;
gridstep*= 4.0f; gridstep*= 4.0f;
} }
} }
else { else {
while(gridsize>=4.0f && gridsize<1000000.0f) { while(gridsize>=4.0f) {
gridsize/= 4.0f; gridsize/= 4.0f;
gridstep/= 4.0f; gridstep/= 4.0f;
} }

@ -45,7 +45,6 @@
#include "DNA_node_types.h" #include "DNA_node_types.h"
#include "DNA_packedFile_types.h" #include "DNA_packedFile_types.h"
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
#include "DNA_meshdata_types.h"
#include "BKE_colortools.h" #include "BKE_colortools.h"
#include "BKE_context.h" #include "BKE_context.h"
@ -57,7 +56,6 @@
#include "BKE_packedFile.h" #include "BKE_packedFile.h"
#include "BKE_report.h" #include "BKE_report.h"
#include "BKE_screen.h" #include "BKE_screen.h"
#include "BKE_tessmesh.h"
#include "IMB_imbuf.h" #include "IMB_imbuf.h"
#include "IMB_imbuf_types.h" #include "IMB_imbuf_types.h"
@ -68,8 +66,6 @@
#include "RNA_define.h" #include "RNA_define.h"
#include "RNA_enum_types.h" #include "RNA_enum_types.h"
#include "bmesh.h"
#include "ED_image.h" #include "ED_image.h"
#include "ED_render.h" #include "ED_render.h"
#include "ED_screen.h" #include "ED_screen.h"

@ -51,7 +51,6 @@
#include "BKE_image.h" #include "BKE_image.h"
#include "BKE_mesh.h" #include "BKE_mesh.h"
#include "BKE_screen.h" #include "BKE_screen.h"
#include "BKE_tessmesh.h"
#include "IMB_imbuf_types.h" #include "IMB_imbuf_types.h"
@ -277,7 +276,7 @@ int ED_space_image_show_uvedit(SpaceImage *sima, Object *obedit)
return 0; return 0;
if(obedit && obedit->type == OB_MESH) { if(obedit && obedit->type == OB_MESH) {
BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh; struct BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh;
int ret; int ret;
ret = EDBM_texFaceCheck(em); 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(ED_space_image_show_paint(sima))
if(obedit && obedit->type == OB_MESH) { if(obedit && obedit->type == OB_MESH) {
BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh; struct BMEditMesh *em = ((Mesh*)obedit->data)->edit_btmesh;
int ret; int ret;
ret = EDBM_texFaceCheck(em); 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)); if(ima && (ima->source==IMA_SRC_VIEWER || sima->pin));
else if(obedit && obedit->type == OB_MESH) { else if(obedit && obedit->type == OB_MESH) {
Mesh *me= (Mesh*)obedit->data; Mesh *me= (Mesh*)obedit->data;
BMEditMesh *em= me->edit_btmesh; struct BMEditMesh *em= me->edit_btmesh;
MTexPoly *tf; MTexPoly *tf;
if(em && EDBM_texFaceCheck(em)) { if(em && EDBM_texFaceCheck(em)) {
@ -1008,3 +1007,4 @@ void ED_spacetype_image(void)
BKE_spacetype_register(st); BKE_spacetype_register(st);
} }

@ -31,8 +31,6 @@
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
#include "DNA_meshdata_types.h"
#include "BLI_blenlib.h" #include "BLI_blenlib.h"
#include "BLI_math.h" #include "BLI_math.h"
#include "BLI_utildefines.h" #include "BLI_utildefines.h"

@ -93,7 +93,6 @@ void view3d_set_viewcontext(bContext *C, ViewContext *vc)
vc->obedit= CTX_data_edit_object(C); 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) int view3d_get_view_aligned_coordinate(ViewContext *vc, float fp[3], const short mval[2], const short do_fallback)
{ {
float dvec[3]; 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 * ob == NULL if you want global matrices
* */ * */
@ -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... */ /* we want a select buffer with bones, if there are... */
/* so check three selection levels and compare */ /* 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; rcti rect;
int offs; int offs;
@ -1104,7 +1102,7 @@ static short mixed_bones_object_selectbuffer(ViewContext *vc, unsigned int *buff
} }
/* returns basact */ /* 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; Scene *scene= vc->scene;
View3D *v3d= vc->v3d; 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 */ /* 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; ViewContext vc;
Base *basact= NULL; Base *basact= NULL;
@ -1222,7 +1220,7 @@ Base *ED_view3d_give_base_under_cursor(bContext *C, const short *mval)
} }
/* mval is region coords */ /* 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; ViewContext vc;
ARegion *ar= CTX_wm_region(C); 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; ToolSettings *ts= vc->scene->toolsettings;
int bbsel; int bbsel;
@ -1985,7 +1983,7 @@ static void mesh_circle_select(ViewContext *vc, int select, const short *mval, f
EDBM_selectmode_flush(vc->em); 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; Object *ob= vc->obact;
Mesh *me = ob?ob->data:NULL; 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; 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); 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; 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; 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; struct {ViewContext *vc; short select, mval[2]; float radius; } data;
bPose *pose = vc->obact->pose; bPose *pose = vc->obact->pose;
@ -2159,7 +2157,7 @@ static short armature_circle_doSelectJoint(void *userData, EditBone *ebone, int
} }
return 0; 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; struct {ViewContext *vc; short select, mval[2]; float radius; } data;
bArmature *arm= vc->obedit->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 */ /** 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) { switch(vc->obedit->type) {
case OB_MESH: case OB_MESH:

@ -22,4 +22,3 @@ if env['BF_NO_ELBEEM']:
env.BlenderLib ( libname = 'bf_modifiers', sources = sources, env.BlenderLib ( libname = 'bf_modifiers', sources = sources,
includes = Split(incs), defines=defs, includes = Split(incs), defines=defs,
libtype=['core','player'], priority = [80, 40] ) libtype=['core','player'], priority = [80, 40] )

@ -201,7 +201,6 @@ typedef struct wmNotifier {
#define ND_FRAME_RANGE (17<<16) #define ND_FRAME_RANGE (17<<16)
#define ND_TRANSFORM_DONE (18<<16) #define ND_TRANSFORM_DONE (18<<16)
#define ND_WORLD (92<<16) #define ND_WORLD (92<<16)
#define ND_LAYER_CONTENT (101<<16)
#define ND_LAYER_CONTENT (101<<16) #define ND_LAYER_CONTENT (101<<16)
/* NC_OBJECT Object */ /* NC_OBJECT Object */

@ -261,7 +261,7 @@ static int wm_macro_modal(bContext *C, wmOperator *op, wmEvent *event)
retval = opm->type->modal(C, opm, event); retval = opm->type->modal(C, opm, event);
/* if this one is done but it's not the last operator in the macro */ /* 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; MacroData *md = op->customdata;
md->retval = OPERATOR_FINISHED; /* keep in mind that at least one operator finished */ md->retval = OPERATOR_FINISHED; /* keep in mind that at least one operator finished */

@ -14,5 +14,4 @@ if env['WITH_BF_PYTHON']:
incs += ' ' + env['BF_PYTHON_INC'] incs += ' ' + env['BF_PYTHON_INC']
defs.append('WITH_PYTHON') defs.append('WITH_PYTHON')
env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=defs,libtype=['core','player'], priority=[400,125], cxx_compileflags=env['BGE_CXXFLAGS']) env.BlenderLib ( 'bf_network', Split(sources), Split(incs), defines=defs,libtype=['core','player'], priority=[400,125], cxx_compileflags=env['BGE_CXXFLAGS'])