From 314b14301fd565b93bbb75697c29b109eacf813d Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Sat, 15 Aug 2009 16:36:25 +0000 Subject: 2.5: warning fixes Directories intern/ and source/blender/ now compile warning free again here with scons/gcc. --- intern/audaspace/intern/AUD_ConverterReader.cpp | 16 + intern/audaspace/intern/AUD_FloatMixer.cpp | 2 + intern/elbeem/intern/paraloopend.h | 6 +- intern/smoke/intern/FLUID_3D_SOLVERS.cpp | 9 +- intern/smoke/intern/VEC3.h | 2 + intern/smoke/intern/WAVELET_NOISE.h | 4 +- intern/smoke/intern/smoke_API.cpp | 14 +- source/blender/blenfont/intern/blf_dir.c | 3 +- source/blender/blenkernel/intern/modifier.c | 3 +- source/blender/blenkernel/intern/particle_system.c | 2 - source/blender/blenkernel/intern/pointcache.c | 5 +- source/blender/blenkernel/intern/smoke.c | 4 +- source/blender/blenlib/intern/BLI_kdopbvh.c | 1 - source/blender/blenlib/intern/BLI_kdtree.c | 2 +- source/blender/blenloader/intern/readfile.c | 9 +- .../editors/animation/anim_channels_defines.c | 12 +- .../blender/editors/armature/editarmature_sketch.c | 2 +- source/blender/editors/include/ED_object.h | 5 + source/blender/editors/mesh/editmesh_mods.c | 2 + source/blender/editors/mesh/editmesh_tools.c | 2 +- source/blender/editors/physics/ed_pointcache.c | 1 - source/blender/editors/physics/physics_boids.c | 5 +- source/blender/editors/space_outliner/outliner.c | 1 - .../editors/space_sequencer/sequencer_draw.c | 6 +- source/blender/editors/space_view3d/drawobject.c | 5 +- .../blender/editors/space_view3d/view3d_buttons.c | 3 +- .../blender/editors/space_view3d/view3d_header.c | 10 +- .../editors/transform/transform_conversions.c | 6 +- .../blender/editors/transform/transform_generics.c | 2 +- source/blender/python/generic/BGL.c | 2 +- source/blender/python/generic/euler.c | 2 +- source/blender/python/generic/matrix.c | 21 +- source/blender/python/generic/quat.c | 2 +- source/blender/python/generic/vector.c | 686 ++++++++++----------- source/blender/python/intern/bpy_rna.c | 2 +- source/blender/python/intern/bpy_ui.c | 2 +- source/blender/python/intern/bpy_util.c | 2 +- 37 files changed, 451 insertions(+), 412 deletions(-) diff --git a/intern/audaspace/intern/AUD_ConverterReader.cpp b/intern/audaspace/intern/AUD_ConverterReader.cpp index 2ff4925644c..da25a2b7460 100644 --- a/intern/audaspace/intern/AUD_ConverterReader.cpp +++ b/intern/audaspace/intern/AUD_ConverterReader.cpp @@ -60,6 +60,8 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_IReader* reader, AUD_Specs specs) : case AUD_FORMAT_FLOAT64: m_convert = AUD_convert_u8_double; break; + default: + break; } break; case AUD_FORMAT_S16: @@ -86,6 +88,8 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_IReader* reader, AUD_Specs specs) : case AUD_FORMAT_FLOAT64: m_convert = AUD_convert_s16_double; break; + default: + break; } break; case AUD_FORMAT_S24: @@ -110,6 +114,8 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_IReader* reader, AUD_Specs specs) : case AUD_FORMAT_FLOAT64: m_convert = AUD_convert_double_s24_be; break; + default: + break; } else switch(specs.format) @@ -132,6 +138,8 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_IReader* reader, AUD_Specs specs) : case AUD_FORMAT_FLOAT64: m_convert = AUD_convert_double_s24_le; break; + default: + break; } break; case AUD_FORMAT_S32: @@ -158,6 +166,8 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_IReader* reader, AUD_Specs specs) : case AUD_FORMAT_FLOAT64: m_convert = AUD_convert_s32_double; break; + default: + break; } break; case AUD_FORMAT_FLOAT32: @@ -184,6 +194,8 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_IReader* reader, AUD_Specs specs) : case AUD_FORMAT_FLOAT64: m_convert = AUD_convert_float_double; break; + default: + break; } break; case AUD_FORMAT_FLOAT64: @@ -210,8 +222,12 @@ AUD_ConverterReader::AUD_ConverterReader(AUD_IReader* reader, AUD_Specs specs) : case AUD_FORMAT_FLOAT64: m_convert = AUD_convert_copy; break; + default: + break; } break; + default: + break; } m_specs.format = specs.format; diff --git a/intern/audaspace/intern/AUD_FloatMixer.cpp b/intern/audaspace/intern/AUD_FloatMixer.cpp index 1678c169845..f7133b9c30e 100644 --- a/intern/audaspace/intern/AUD_FloatMixer.cpp +++ b/intern/audaspace/intern/AUD_FloatMixer.cpp @@ -125,6 +125,8 @@ void AUD_FloatMixer::setSpecs(AUD_Specs specs) case AUD_FORMAT_FLOAT64: m_convert = AUD_convert_float_double; break; + default: + break; } } diff --git a/intern/elbeem/intern/paraloopend.h b/intern/elbeem/intern/paraloopend.h index 6bb224b625a..a396e395126 100644 --- a/intern/elbeem/intern/paraloopend.h +++ b/intern/elbeem/intern/paraloopend.h @@ -22,9 +22,9 @@ { if(doReduce) { // synchronize global vars - for(int j=0; jaddFullParticle( calcListParts[j] ); + for(size_t j=0; jaddFullParticle( calcListParts[j] ); if(calcMaxVlen>mMaxVlen) { mMxvx = calcMxvx; mMxvy = calcMxvy; diff --git a/intern/smoke/intern/FLUID_3D_SOLVERS.cpp b/intern/smoke/intern/FLUID_3D_SOLVERS.cpp index 9d546009a8c..a35beaa05d7 100644 --- a/intern/smoke/intern/FLUID_3D_SOLVERS.cpp +++ b/intern/smoke/intern/FLUID_3D_SOLVERS.cpp @@ -26,7 +26,8 @@ void FLUID_3D::solvePressurePre(float* field, float* b, unsigned char* skip) { - size_t x, y, z, index; + int x, y, z; + size_t index; // i = 0 int i = 0; @@ -197,7 +198,8 @@ void FLUID_3D::solvePressurePre(float* field, float* b, unsigned char* skip) ////////////////////////////////////////////////////////////////////// void FLUID_3D::solvePressure(float* field, float* b, unsigned char* skip) { - size_t x, y, z, index; + int x, y, z; + size_t index; // i = 0 int i = 0; @@ -348,7 +350,8 @@ void FLUID_3D::solvePressure(float* field, float* b, unsigned char* skip) ////////////////////////////////////////////////////////////////////// void FLUID_3D::solveHeat(float* field, float* b, unsigned char* skip) { - size_t x, y, z, index; + int x, y, z; + size_t index; const float heatConst = _dt * _heatDiffusion / (_dx * _dx); // i = 0 diff --git a/intern/smoke/intern/VEC3.h b/intern/smoke/intern/VEC3.h index 607f68279a2..98c4555ac5f 100644 --- a/intern/smoke/intern/VEC3.h +++ b/intern/smoke/intern/VEC3.h @@ -926,7 +926,9 @@ inline void hsvToRgb( VECTOR_TYPE &V ) //! global string for formatting vector output in utilities.cpp //extern const char *globVecFormatStr; +#if 0 static const char *globVecFormatStr = "[%6.4f,%6.4f,%6.4f]"; +#endif /************************************************************************* Outputs the object in human readable form using the format diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h index 493ed1642fc..4c2e7514af7 100644 --- a/intern/smoke/intern/WAVELET_NOISE.h +++ b/intern/smoke/intern/WAVELET_NOISE.h @@ -220,7 +220,7 @@ static bool loadTile(float* const noiseTileData, std::string filename) } // dimensions - int gridSize = noiseTileSize * noiseTileSize * noiseTileSize; + size_t gridSize = noiseTileSize * noiseTileSize * noiseTileSize; // noiseTileData memory is managed by caller size_t bread = fread((void*)noiseTileData, sizeof(float), gridSize, file); @@ -228,7 +228,7 @@ static bool loadTile(float* const noiseTileData, std::string filename) printf("Noise tile file '%s' loaded.\n", filename.c_str()); if (bread != gridSize) { - printf("loadTile: Noise tile '%s' is wrong size %d.\n", filename.c_str(), bread); + printf("loadTile: Noise tile '%s' is wrong size %d.\n", filename.c_str(), (int)bread); return false; } return true; diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp index 7f90971f14d..2e95a576eaf 100644 --- a/intern/smoke/intern/smoke_API.cpp +++ b/intern/smoke/intern/smoke_API.cpp @@ -93,15 +93,16 @@ extern "C" void smoke_initBlenderRNA(FLUID_3D *fluid, float *alpha, float *beta) extern "C" void smoke_dissolve(FLUID_3D *fluid, int speed, int log) { float *density = fluid->_density; - float *densityOld = fluid->_densityOld; + //float *densityOld = fluid->_densityOld; float *heat = fluid->_heat; if(log) { /* max density/speed = dydx */ float dydx = 1.0 / (float)speed; + size_t size= fluid->_xRes * fluid->_yRes * fluid->_zRes; - for(size_t i = 0; i < fluid->_xRes * fluid->_yRes * fluid->_zRes; i++) + for(size_t i = 0; i < size; i++) { density[i] *= (1.0 - dydx); @@ -118,8 +119,9 @@ extern "C" void smoke_dissolve(FLUID_3D *fluid, int speed, int log) { /* max density/speed = dydx */ float dydx = 1.0 / (float)speed; + size_t size= fluid->_xRes * fluid->_yRes * fluid->_zRes; - for(size_t i = 0; i < fluid->_xRes * fluid->_yRes * fluid->_zRes; i++) + for(size_t i = 0; i < size; i++) { density[i] -= dydx; @@ -144,8 +146,9 @@ extern "C" void smoke_dissolve_wavelet(WTURBULENCE *wt, int speed, int log) { /* max density/speed = dydx */ float dydx = 1.0 / (float)speed; + size_t size= r[0] * r[1] * r[2]; - for(size_t i = 0; i < r[0] * r[1] * r[2]; i++) + for(size_t i = 0; i < size; i++) { density[i] *= (1.0 - dydx); @@ -157,8 +160,9 @@ extern "C" void smoke_dissolve_wavelet(WTURBULENCE *wt, int speed, int log) { /* max density/speed = dydx */ float dydx = 1.0 / (float)speed; + size_t size= r[0] * r[1] * r[2]; - for(size_t i = 0; i < r[0] * r[1] * r[2]; i++) + for(size_t i = 0; i < size; i++) { density[i] -= dydx; diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c index 92dfe8457b0..b4d902ff428 100644 --- a/source/blender/blenfont/intern/blf_dir.c +++ b/source/blender/blenfont/intern/blf_dir.c @@ -153,7 +153,8 @@ char *blf_dir_search(char *file) int blf_dir_split(const char *str, char *file, int *size) { - char *s, i, len; + int i, len; + char *s; /* Window, Linux or Mac, this is always / */ s= strrchr(str, '/'); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index ecba1c1a6ad..53d1baa5c9c 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -5858,8 +5858,7 @@ static void smokeModifier_updateDepgraph( ModifierData *md, DagForest *forest, Scene *scene, Object *ob, DagNode *obNode) { - SmokeModifierData *smd = (SmokeModifierData *) md; - /* + /*SmokeModifierData *smd = (SmokeModifierData *) md; if(smd && (smd->type & MOD_SMOKE_TYPE_DOMAIN) && smd->domain) { if(smd->domain->fluid_group) diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 2f4a5c28385..f81eba2badf 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2271,8 +2271,6 @@ void psys_make_temp_pointcache(Object *ob, ParticleSystem *psys) } void psys_clear_temp_pointcache(ParticleSystem *psys) { - PTCacheMem *pm = psys->pointcache->mem_cache.first; - if((psys->pointcache->flag & PTCACHE_DISK_CACHE)==0) return; diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index d326fa84ed4..09170d92866 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -972,7 +972,7 @@ int BKE_ptcache_read_cache(PTCacheID *pid, float cfra, float frs_sec) float old_data1[14], old_data2[14]; int cfrai = (int)cfra; int old_elemsize = ptcache_pid_old_elemsize(pid); - int i, incr = old_elemsize / sizeof(float); + int i; int cfra1 = 0, cfra2 = 0; int totpoint = 0, totpoint2 = 0; @@ -1265,8 +1265,7 @@ int BKE_ptcache_write_cache(PTCacheID *pid, int cfra) { PointCache *cache = pid->cache; PTCacheFile *pf= NULL; - int elemsize = ptcache_pid_old_elemsize(pid); - int i, incr = elemsize / sizeof(float); + int i; int totpoint = pid->totpoint(pid->calldata); int add = 0, overwrite = 0; diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 9d4c75245cf..22ea41276ff 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -260,7 +260,7 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive int *tridivs = NULL; float cell_len = 1.0 / 50.0; // for res = 50 size_t newdivs = 0; - size_t max_points = 0; + //size_t max_points = 0; size_t quads = 0, facecounter = 0; // copy obmat @@ -302,7 +302,7 @@ int smokeModifier_init (SmokeModifierData *smd, Object *ob, Scene *scene, Derive size_t j, k; int divs1 = tridivs[3 * facecounter + 0]; int divs2 = tridivs[3 * facecounter + 1]; - int divs3 = tridivs[3 * facecounter + 2]; + //int divs3 = tridivs[3 * facecounter + 2]; float side1[3], side2[3], trinormorg[3], trinorm[3]; if(again == 1 && mface[i].v4) diff --git a/source/blender/blenlib/intern/BLI_kdopbvh.c b/source/blender/blenlib/intern/BLI_kdopbvh.c index 84de9f9d862..07e81b291f5 100644 --- a/source/blender/blenlib/intern/BLI_kdopbvh.c +++ b/source/blender/blenlib/intern/BLI_kdopbvh.c @@ -1530,7 +1530,6 @@ float BLI_bvhtree_bb_raycast(float *bv, float *light_start, float *light_end, fl { BVHRayCastData data; float dist = 0.0; - int i; data.hit.dist = FLT_MAX; diff --git a/source/blender/blenlib/intern/BLI_kdtree.c b/source/blender/blenlib/intern/BLI_kdtree.c index 79a46da4c66..1f3a861ba6a 100644 --- a/source/blender/blenlib/intern/BLI_kdtree.c +++ b/source/blender/blenlib/intern/BLI_kdtree.c @@ -374,7 +374,7 @@ int BLI_kdtree_range_search(KDTree *tree, float range, float *co, float *nor, KD KDTreeNode **stack, *defaultstack[100]; KDTreeNearest *foundstack=NULL; float range2 = range*range, dist2; - int i, totstack, cur=0, found=0, totfoundstack=0; + int totstack, cur=0, found=0, totfoundstack=0; if(!tree || !tree->root) return 0; diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 4515032218e..fc9cd47f1c2 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -9208,8 +9208,8 @@ static void do_versions(FileData *fd, Library *lib, Main *main) Tex *tx; ParticleSettings *part; Object *ob; - PTCacheID *pid; - ListBase pidlist; + //PTCacheID *pid; + //ListBase pidlist; bSound *sound; Sequence *seq; @@ -9358,14 +9358,13 @@ static void do_versions(FileData *fd, Library *lib, Main *main) /* TODO: should be moved into one of the version blocks once this branch moves to trunk and we can bump the version (or sub-version.) */ { - World *wo; Object *ob; Material *ma; Tex *tex; Scene *sce; ToolSettings *ts; - PTCacheID *pid; - ListBase pidlist; + //PTCacheID *pid; + //ListBase pidlist; int i, a; for(ob = main->object.first; ob; ob = ob->id.next) { diff --git a/source/blender/editors/animation/anim_channels_defines.c b/source/blender/editors/animation/anim_channels_defines.c index 32bda94f796..08155141053 100644 --- a/source/blender/editors/animation/anim_channels_defines.c +++ b/source/blender/editors/animation/anim_channels_defines.c @@ -274,7 +274,7 @@ static void acf_generic_idblock_name(bAnimListElem *ale, char *name) /* just copy the name... */ if (id && name) - sprintf(name, id->name+2); + strcpy(name, id->name+2); } /* Settings ------------------------------------------- */ @@ -441,7 +441,7 @@ static void acf_object_name(bAnimListElem *ale, char *name) /* just copy the name... */ if (ob && name) - sprintf(name, ob->id.name+2); + strcpy(name, ob->id.name+2); } /* check if some setting exists for this channel */ @@ -554,7 +554,7 @@ static void acf_group_name(bAnimListElem *ale, char *name) /* just copy the name... */ if (agrp && name) - sprintf(name, agrp->name); + strcpy(name, agrp->name); } /* check if some setting exists for this channel */ @@ -783,7 +783,7 @@ static int acf_filldrivers_icon(bAnimListElem *ale) static void acf_filldrivers_name(bAnimListElem *ale, char *name) { - sprintf(name, "Drivers"); + strcpy(name, "Drivers"); } /* check if some setting exists for this channel */ @@ -858,7 +858,7 @@ static int acf_fillmatd_icon(bAnimListElem *ale) static void acf_fillmatd_name(bAnimListElem *ale, char *name) { - sprintf(name, "Materials"); + strcpy(name, "Materials"); } /* get the appropriate flag(s) for the setting when it is valid */ @@ -902,7 +902,7 @@ static int acf_fillpartd_icon(bAnimListElem *ale) static void acf_fillpartd_name(bAnimListElem *ale, char *name) { - sprintf(name, "Particles"); + strcpy(name, "Particles"); } /* get the appropriate flag(s) for the setting when it is valid */ diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index ce3bcc8aed5..79d3d7b1366 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -2320,7 +2320,7 @@ void sk_drawSketch(Scene *scene, View3D *v3d, SK_Sketch *sketch, int with_names) for (p = sketch->depth_peels.first; p; p = p->next) { - int index = (int)(p->ob); + int index = GET_INT_FROM_POINTER(p->ob); index = (index >> 5) & 7; glColor3fv(colors[index]); diff --git a/source/blender/editors/include/ED_object.h b/source/blender/editors/include/ED_object.h index c8a72a2aa97..a3552cc725d 100644 --- a/source/blender/editors/include/ED_object.h +++ b/source/blender/editors/include/ED_object.h @@ -69,6 +69,8 @@ void ED_object_enter_editmode(struct bContext *C, int flag); void ED_object_base_init_from_view(struct bContext *C, struct Base *base); +void ED_object_single_users(struct Scene *scene, int full); + /* cleanup */ int object_is_libdata(struct Object *ob); int object_data_is_libdata(struct Object *ob); @@ -89,6 +91,9 @@ void ED_object_constraint_set_active(struct Object *ob, struct bConstraint *con) void mouse_lattice(struct bContext *C, short mval[2], int extend); void undo_push_lattice(struct bContext *C, char *name); +/* editmball.c */ +void undo_push_mball(struct bContext *C, char *name); + /* editkey.c */ void insert_shapekey(struct Scene *scene, struct Object *ob); void delete_key(struct Scene *scene, struct Object *ob); diff --git a/source/blender/editors/mesh/editmesh_mods.c b/source/blender/editors/mesh/editmesh_mods.c index 72ca97921ef..44f63427e5f 100644 --- a/source/blender/editors/mesh/editmesh_mods.c +++ b/source/blender/editors/mesh/editmesh_mods.c @@ -4309,6 +4309,8 @@ static int smooth_vertex_exec(bContext *C, wmOperator *op) for (i=0; itoolsettings->editbutflag|flag, cuts, 0); DAG_object_flush_update(scene, obedit, OB_RECALC_DATA); - WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit); + WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_DATA, obedit); return OPERATOR_FINISHED; } diff --git a/source/blender/editors/physics/ed_pointcache.c b/source/blender/editors/physics/ed_pointcache.c index a256fd97686..917e2b40d72 100644 --- a/source/blender/editors/physics/ed_pointcache.c +++ b/source/blender/editors/physics/ed_pointcache.c @@ -266,7 +266,6 @@ static int ptcache_add_new_exec(bContext *C, wmOperator *op) } static int ptcache_remove_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); PointerRNA ptr= CTX_data_pointer_get_type(C, "PointCache", &RNA_PointCache); Object *ob= ptr.id.data; PointCache *cache= ptr.data; diff --git a/source/blender/editors/physics/physics_boids.c b/source/blender/editors/physics/physics_boids.c index 2d3b11080e7..148359068ad 100644 --- a/source/blender/editors/physics/physics_boids.c +++ b/source/blender/editors/physics/physics_boids.c @@ -249,7 +249,6 @@ void BOID_OT_boidrule_move_down(wmOperatorType *ot) /************************ add/del boid state operators *********************/ static int boidstate_add_exec(bContext *C, wmOperator *op) { - Scene *scene = CTX_data_scene(C); PointerRNA ptr = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem); ParticleSystem *psys= ptr.data; Object *ob= ptr.id.data; @@ -344,7 +343,6 @@ void BOID_OT_boidstate_del(wmOperatorType *ot) /************************ move up/down boid state operators *********************/ static int boidstate_move_up_exec(bContext *C, wmOperator *op) { - Scene *scene= CTX_data_scene(C); PointerRNA ptr = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem); ParticleSystem *psys= ptr.data; Object *ob = ptr.id.data; @@ -385,7 +383,6 @@ static int boidstate_move_down_exec(bContext *C, wmOperator *op) Scene *scene= CTX_data_scene(C); PointerRNA ptr = CTX_data_pointer_get_type(C, "particle_system", &RNA_ParticleSystem); ParticleSystem *psys= ptr.data; - Object *ob = ptr.id.data; BoidSettings *boids; BoidState *state; @@ -430,4 +427,4 @@ void ED_operatortypes_boids(void) WM_operatortype_append(BOID_OT_boidstate_del); WM_operatortype_append(BOID_OT_boidstate_move_up); WM_operatortype_append(BOID_OT_boidstate_move_down); -} \ No newline at end of file +} diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c index e4fa095e552..3c2e36cc20a 100644 --- a/source/blender/editors/space_outliner/outliner.c +++ b/source/blender/editors/space_outliner/outliner.c @@ -1016,7 +1016,6 @@ static TreeElement *outliner_add_element(SpaceOops *soops, ListBase *lb, void *i PointerRNA pptr, propptr, *ptr= (PointerRNA*)idv; PropertyRNA *prop, *iterprop; PropertyType proptype; - PropertySubType propsubtype; int a, tot; /* we do lazy build, for speed and to avoid infinite recusion */ diff --git a/source/blender/editors/space_sequencer/sequencer_draw.c b/source/blender/editors/space_sequencer/sequencer_draw.c index 3d0d908d3f6..367bfb68208 100644 --- a/source/blender/editors/space_sequencer/sequencer_draw.c +++ b/source/blender/editors/space_sequencer/sequencer_draw.c @@ -660,9 +660,9 @@ static void draw_seq_strip(Scene *scene, ARegion *ar, SpaceSeq *sseq, Sequence * draw_shadedstrip(seq, background_col, x1, y1, x2, y2); /* draw additional info and controls */ -// XXX -/* if (seq->type == SEQ_SOUND) - drawseqwave(scene, v2d, seq, x1, y1, x2, y2, ar->winx);*/ + // XXX + if(0) // (seq->type == SEQ_SOUND) + drawseqwave(scene, v2d, seq, x1, y1, x2, y2, ar->winx); if (!is_single_image) draw_seq_extensions(scene, sseq, seq); diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 0f2b43a260d..8123918d0b6 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5298,15 +5298,14 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) } /* draw code for smoke */ - if(md = modifiers_findByType(ob, eModifierType_Smoke)) + if((md = modifiers_findByType(ob, eModifierType_Smoke))) { SmokeModifierData *smd = (SmokeModifierData *)md; // draw collision objects if((smd->type & MOD_SMOKE_TYPE_COLL) && smd->coll) { - SmokeCollSettings *scs = smd->coll; - /* + /*SmokeCollSettings *scs = smd->coll; if(scs->points) { size_t i; diff --git a/source/blender/editors/space_view3d/view3d_buttons.c b/source/blender/editors/space_view3d/view3d_buttons.c index 4b7f7ebed29..c09646e7cd7 100644 --- a/source/blender/editors/space_view3d/view3d_buttons.c +++ b/source/blender/editors/space_view3d/view3d_buttons.c @@ -1002,6 +1002,7 @@ static void view3d_panel_transform_spaces(const bContext *C, Panel *pa) } #endif // XXX not used +#if 0 static void brush_idpoin_handle(bContext *C, ID *id, int event) { Brush **br = current_brush_source(CTX_data_scene(C)); @@ -1032,6 +1033,7 @@ static void brush_idpoin_handle(bContext *C, ID *id, int event) break; } } +#endif static void view3d_panel_object(const bContext *C, Panel *pa) { @@ -1043,7 +1045,6 @@ static void view3d_panel_object(const bContext *C, Panel *pa) Object *ob= OBACT; TransformProperties *tfp; float lim; - static char hexcol[128]; if(ob==NULL) return; diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c index 425cebf04cb..d92d9efede3 100644 --- a/source/blender/editors/space_view3d/view3d_header.c +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -134,7 +134,7 @@ static int retopo_mesh_paint_check() {return 0;} /* end XXX ************* */ -static int ED_toggle_paint_modes(bContext *C, int mode) +static void ED_toggle_paint_modes(bContext *C, int mode) { if(mode & G_TEXTUREPAINT) WM_operator_name_call(C, "PAINT_OT_texture_paint_toggle", WM_OP_EXEC_REGION_WIN, NULL); @@ -1237,6 +1237,7 @@ static void view3d_edit_snapmenu(bContext *C, uiLayout *layout, void *arg_unused uiItemO(layout, NULL, 0, "VIEW3D_OT_snap_cursor_to_active"); } +#if 0 void do_view3d_transform_moveaxismenu(bContext *C, void *arg, int event) { #if 0 @@ -1437,7 +1438,9 @@ static uiBlock *view3d_transform_scaleaxismenu(bContext *C, ARegion *ar, void *a uiTextBoundsBlock(block, 60); return block; } +#endif +#if 0 static void do_view3d_transformmenu(bContext *C, void *arg, int event) { #if 0 @@ -1673,6 +1676,7 @@ static uiBlock *view3d_object_mirrormenu(bContext *C, ARegion *ar, void *arg_unu return block; } #endif +#endif static void view3d_edit_object_transformmenu(bContext *C, uiLayout *layout, void *arg_unused) { @@ -2243,9 +2247,9 @@ static void view3d_edit_mesh_normalsmenu(bContext *C, uiLayout *layout, void *ar uiItemO(layout, NULL, 0, "MESH_OT_flip_normals"); } +#if 0 void do_view3d_edit_mirrormenu(bContext *C, void *arg, int event) { -#if 0 float mat[3][3]; Mat3One(mat); @@ -2286,7 +2290,6 @@ void do_view3d_edit_mirrormenu(bContext *C, void *arg, int event) Transform(); break; } -#endif } static uiBlock *view3d_edit_mirrormenu(bContext *C, ARegion *ar, void *arg_unused) @@ -2315,6 +2318,7 @@ static uiBlock *view3d_edit_mirrormenu(bContext *C, ARegion *ar, void *arg_unuse uiTextBoundsBlock(block, 60); return block; } +#endif static void view3d_edit_mesh_showhidemenu(bContext *C, uiLayout *layout, void *arg_unused) { diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c index 40e133f554f..be677c8523d 100644 --- a/source/blender/editors/transform/transform_conversions.c +++ b/source/blender/editors/transform/transform_conversions.c @@ -4957,9 +4957,9 @@ static void createTransObject(bContext *C, TransInfo *t) set_trans_object_base_flags(C, t); /* count */ +#if 0 // TRANSFORM_FIX_ME CTX_DATA_BEGIN(C, Object*, ob, selected_objects) { -#if 0 // TRANSFORM_FIX_ME /* store ipo keys? */ if ((ob->id.lib == 0) && (ob->ipo) && (ob->ipo->showkey) && (ob->ipoflag & OB_DRAWKEY)) { elems.first= elems.last= NULL; @@ -4973,12 +4973,14 @@ static void createTransObject(bContext *C, TransInfo *t) if(elems.first==NULL) t->total++; } -#endif // else { t->total++; // } } CTX_DATA_END; +#else + t->total= CTX_DATA_COUNT(C, selected_objects); +#endif if(!t->total) { /* clear here, main transform function escapes too */ diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 9e04799d77e..d0365e6f92a 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -765,7 +765,7 @@ void recalcData(TransInfo *t) */ // TODO: autokeyframe calls need some setting to specify to add samples (FPoints) instead of keyframes? if ((t->animtimer) && IS_AUTOKEY_ON(t->scene)) { - short targetless_ik= (t->flag & T_AUTOIK); // XXX this currently doesn't work, since flags aren't set yet! + int targetless_ik= (t->flag & T_AUTOIK); // XXX this currently doesn't work, since flags aren't set yet! animrecord_check_state(t->scene, &ob->id, t->animtimer); autokeyframe_pose_cb_func(t->scene, (View3D *)t->view, ob, t->mode, targetless_ik); diff --git a/source/blender/python/generic/BGL.c b/source/blender/python/generic/BGL.c index 2fd9130857f..767af8e0836 100644 --- a/source/blender/python/generic/BGL.c +++ b/source/blender/python/generic/BGL.c @@ -67,7 +67,7 @@ static int Buffer_ass_slice( PyObject * self, int begin, int end, PyObject * seq ); static PySequenceMethods Buffer_SeqMethods = { - ( inquiry ) Buffer_len, /*sq_length */ + ( lenfunc ) Buffer_len, /*sq_length */ ( binaryfunc ) 0, /*sq_concat */ ( ssizeargfunc ) 0, /*sq_repeat */ ( ssizeargfunc ) Buffer_item, /*sq_item */ diff --git a/source/blender/python/generic/euler.c b/source/blender/python/generic/euler.c index c6aaee64ebe..14ee03ad888 100644 --- a/source/blender/python/generic/euler.c +++ b/source/blender/python/generic/euler.c @@ -508,7 +508,7 @@ static int Euler_ass_slice(EulerObject * self, int begin, int end, } //-----------------PROTCOL DECLARATIONS-------------------------- static PySequenceMethods Euler_SeqMethods = { - (inquiry) Euler_len, /* sq_length */ + (lenfunc) Euler_len, /* sq_length */ (binaryfunc) 0, /* sq_concat */ (ssizeargfunc) 0, /* sq_repeat */ (ssizeargfunc) Euler_item, /* sq_item */ diff --git a/source/blender/python/generic/matrix.c b/source/blender/python/generic/matrix.c index d4153243516..be3e704460a 100644 --- a/source/blender/python/generic/matrix.c +++ b/source/blender/python/generic/matrix.c @@ -37,14 +37,17 @@ static PyObject *column_vector_multiplication(MatrixObject * mat, VectorObject* /* matrix vector callbacks */ int mathutils_matrix_vector_cb_index= -1; -static int mathutils_matrix_vector_check(MatrixObject *self) +static int mathutils_matrix_vector_check(PyObject *self_p) { + MatrixObject *self= (MatrixObject*)self_p; return BaseMath_ReadCallback(self); } -static int mathutils_matrix_vector_get(MatrixObject *self, int subtype, float *vec_from) +static int mathutils_matrix_vector_get(PyObject *self_p, int subtype, float *vec_from) { + MatrixObject *self= (MatrixObject*)self_p; int i; + if(!BaseMath_ReadCallback(self)) return 0; @@ -54,9 +57,11 @@ static int mathutils_matrix_vector_get(MatrixObject *self, int subtype, float *v return 1; } -static int mathutils_matrix_vector_set(MatrixObject *self, int subtype, float *vec_to) +static int mathutils_matrix_vector_set(PyObject *self_p, int subtype, float *vec_to) { + MatrixObject *self= (MatrixObject*)self_p; int i; + if(!BaseMath_ReadCallback(self)) return 0; @@ -67,8 +72,10 @@ static int mathutils_matrix_vector_set(MatrixObject *self, int subtype, float *v return 1; } -static int mathutils_matrix_vector_get_index(MatrixObject *self, int subtype, float *vec_from, int index) +static int mathutils_matrix_vector_get_index(PyObject *self_p, int subtype, float *vec_from, int index) { + MatrixObject *self= (MatrixObject*)self_p; + if(!BaseMath_ReadCallback(self)) return 0; @@ -76,8 +83,10 @@ static int mathutils_matrix_vector_get_index(MatrixObject *self, int subtype, fl return 1; } -static int mathutils_matrix_vector_set_index(MatrixObject *self, int subtype, float *vec_to, int index) +static int mathutils_matrix_vector_set_index(PyObject *self_p, int subtype, float *vec_to, int index) { + MatrixObject *self= (MatrixObject*)self_p; + if(!BaseMath_ReadCallback(self)) return 0; @@ -988,7 +997,7 @@ static PyObject* Matrix_inv(MatrixObject *self) /*-----------------PROTOCOL DECLARATIONS--------------------------*/ static PySequenceMethods Matrix_SeqMethods = { - (inquiry) Matrix_len, /* sq_length */ + (lenfunc) Matrix_len, /* sq_length */ (binaryfunc) 0, /* sq_concat */ (ssizeargfunc) 0, /* sq_repeat */ (ssizeargfunc) Matrix_item, /* sq_item */ diff --git a/source/blender/python/generic/quat.c b/source/blender/python/generic/quat.c index e06bee32031..7e12fe7925a 100644 --- a/source/blender/python/generic/quat.c +++ b/source/blender/python/generic/quat.c @@ -611,7 +611,7 @@ static PyObject *Quaternion_mul(PyObject * q1, PyObject * q2) //-----------------PROTOCOL DECLARATIONS-------------------------- static PySequenceMethods Quaternion_SeqMethods = { - (inquiry) Quaternion_len, /* sq_length */ + (lenfunc) Quaternion_len, /* sq_length */ (binaryfunc) 0, /* sq_concat */ (ssizeargfunc) 0, /* sq_repeat */ (ssizeargfunc) Quaternion_item, /* sq_item */ diff --git a/source/blender/python/generic/vector.c b/source/blender/python/generic/vector.c index 63bc2fbc7d1..923c4bbe58a 100644 --- a/source/blender/python/generic/vector.c +++ b/source/blender/python/generic/vector.c @@ -1054,7 +1054,7 @@ static PyObject* Vector_richcmpr(PyObject *objectA, PyObject *objectB, int compa /*-----------------PROTCOL DECLARATIONS--------------------------*/ static PySequenceMethods Vector_SeqMethods = { - (inquiry) Vector_len, /* sq_length */ + (lenfunc) Vector_len, /* sq_length */ (binaryfunc) 0, /* sq_concat */ (ssizeargfunc) 0, /* sq_repeat */ (ssizeargfunc) Vector_item, /* sq_item */ @@ -1267,7 +1267,7 @@ static PyObject *Vector_getSwizzle(VectorObject * self, void *closure) /* Unpack the axes from the closure into an array. */ axisA = 0; - swizzleClosure = (unsigned int) closure; + swizzleClosure = GET_INT_FROM_POINTER(closure); while (swizzleClosure & SWIZZLE_VALID_AXIS) { axisB = swizzleClosure & SWIZZLE_AXIS; @@ -1307,7 +1307,7 @@ static int Vector_setSwizzle(VectorObject * self, PyObject * value, void *closur /* Check that the closure can be used with this vector: even 2D vectors have swizzles defined for axes z and w, but they would be invalid. */ - swizzleClosure = (unsigned int) closure; + swizzleClosure = GET_INT_FROM_POINTER(closure); while (swizzleClosure & SWIZZLE_VALID_AXIS) { axisA = swizzleClosure & SWIZZLE_AXIS; @@ -1324,7 +1324,7 @@ static int Vector_setSwizzle(VectorObject * self, PyObject * value, void *closur /* Copy vector contents onto swizzled axes. */ vecVal = (VectorObject*) value; axisB = 0; - swizzleClosure = (unsigned int) closure; + swizzleClosure = GET_INT_FROM_POINTER(closure); while (swizzleClosure & SWIZZLE_VALID_AXIS && axisB < vecVal->size) { axisA = swizzleClosure & SWIZZLE_AXIS; @@ -1340,7 +1340,7 @@ static int Vector_setSwizzle(VectorObject * self, PyObject * value, void *closur { /* Copy list contents onto swizzled axes. */ listLen = PyList_Size(value); - swizzleClosure = (unsigned int) closure; + swizzleClosure = GET_INT_FROM_POINTER(closure); axisB = 0; while (swizzleClosure & SWIZZLE_VALID_AXIS && axisB < listLen) { @@ -1365,7 +1365,7 @@ static int Vector_setSwizzle(VectorObject * self, PyObject * value, void *closur else if (((scalarVal = (float)PyFloat_AsDouble(value)) == -1.0 && PyErr_Occurred())==0) { /* Assign the same value to each axis. */ - swizzleClosure = (unsigned int) closure; + swizzleClosure = GET_INT_FROM_POINTER(closure); while (swizzleClosure & SWIZZLE_VALID_AXIS) { axisA = swizzleClosure & SWIZZLE_AXIS; @@ -1424,342 +1424,342 @@ static PyGetSetDef Vector_getseters[] = { NULL}, /* autogenerated swizzle attrs, see python script below */ - {"xx", (getter)Vector_getSwizzle, (setter)Vector_setSwizzle, NULL, (void *)((unsigned int)((0|SWIZZLE_VALID_AXIS) | ((0|SWIZZLE_VALID_AXIS)<ob_refcnt); + fprintf(stderr, " ref:%d ", (int)var->ob_refcnt); fprintf(stderr, " ptr:%p", (void *)var); fprintf(stderr, " type:"); -- cgit v1.2.3