diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-06 15:13:32 +0300 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-03-06 15:13:32 +0300 |
commit | 33efa9eeb63db672d9da97b68718aefb14b98f64 (patch) | |
tree | aa3e0604a33ff8a498184615e52a607bba7241a6 /source/blender/blenkernel | |
parent | 29fafab10702d83954999342b9823eedc68fdea1 (diff) | |
parent | a2b128aa359627cc1b6d464148cb3fbc30fd32b0 (diff) |
Merged changes in the trunk up to revision 35367.
To branch builders: From this revision Python 3.2 will be used.
Don't forget svn update in the "lib" directory as well.
Diffstat (limited to 'source/blender/blenkernel')
96 files changed, 536 insertions, 47 deletions
diff --git a/source/blender/blenkernel/BKE_customdata_file.h b/source/blender/blenkernel/BKE_customdata_file.h index f97565f23a1..030d46fc1a6 100644 --- a/source/blender/blenkernel/BKE_customdata_file.h +++ b/source/blender/blenkernel/BKE_customdata_file.h @@ -44,12 +44,12 @@ void cdf_free(CDataFile *cdf); int cdf_read_open(CDataFile *cdf, char *filename); int cdf_read_layer(CDataFile *cdf, CDataFileLayer *blay); -int cdf_read_data(CDataFile *cdf, int size, void *data); +int cdf_read_data(CDataFile *cdf, unsigned int size, void *data); void cdf_read_close(CDataFile *cdf); int cdf_write_open(CDataFile *cdf, char *filename); int cdf_write_layer(CDataFile *cdf, CDataFileLayer *blay); -int cdf_write_data(CDataFile *cdf, int size, void *data); +int cdf_write_data(CDataFile *cdf, unsigned int size, void *data); void cdf_write_close(CDataFile *cdf); void cdf_remove(char *filename); diff --git a/source/blender/blenkernel/BKE_mesh.h b/source/blender/blenkernel/BKE_mesh.h index 0f5780ed5b0..4a7e14f7d7d 100644 --- a/source/blender/blenkernel/BKE_mesh.h +++ b/source/blender/blenkernel/BKE_mesh.h @@ -156,7 +156,7 @@ int mesh_center_bounds(struct Mesh *me, float cent[3]); void mesh_translate(struct Mesh *me, float offset[3], int do_keys); /* mesh_validate.c */ -int BKE_mesh_validate_arrays(struct Mesh *me, struct MVert *mverts, int totvert, struct MEdge *medges, int totedge, struct MFace *mfaces, int totface, const short do_verbose, const short do_fixes); +int BKE_mesh_validate_arrays(struct Mesh *me, struct MVert *mverts, unsigned int totvert, struct MEdge *medges, unsigned int totedge, struct MFace *mfaces, unsigned int totface, const short do_verbose, const short do_fixes); int BKE_mesh_validate(struct Mesh *me, int do_verbose); int BKE_mesh_validate_dm(struct DerivedMesh *dm); diff --git a/source/blender/blenkernel/BKE_modifier.h b/source/blender/blenkernel/BKE_modifier.h index af625ae9d9c..648e67cad8a 100644 --- a/source/blender/blenkernel/BKE_modifier.h +++ b/source/blender/blenkernel/BKE_modifier.h @@ -305,7 +305,7 @@ int modifier_sameTopology(ModifierData *md); int modifier_isEnabled(struct Scene *scene, struct ModifierData *md, int required_mode); void modifier_setError(struct ModifierData *md, const char *format, ...) #ifdef __GNUC__ -__attribute__ ((format (printf, 2, 3))); +__attribute__ ((format (printf, 2, 3))) #endif ; diff --git a/source/blender/blenkernel/BKE_report.h b/source/blender/blenkernel/BKE_report.h index 397c96422a5..253f3ea9ac1 100644 --- a/source/blender/blenkernel/BKE_report.h +++ b/source/blender/blenkernel/BKE_report.h @@ -51,7 +51,7 @@ void BKE_reports_clear(ReportList *reports); void BKE_report(ReportList *reports, ReportType type, const char *message); void BKE_reportf(ReportList *reports, ReportType type, const char *format, ...) #ifdef __GNUC__ -__attribute__ ((format (printf, 3, 4))); +__attribute__ ((format (printf, 3, 4))) #endif ; diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index ac85f91bf46..aa057e22d20 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -78,7 +78,7 @@ int scene_camera_switch_update(struct Scene *scene); char *scene_find_marker_name(struct Scene *scene, int frame); char *scene_find_last_marker_name(struct Scene *scene, int frame); -int scene_marker_tfm_translate(struct Scene *scene, int delta, int flag); +int scene_marker_tfm_translate(struct Scene *scene, int delta, unsigned int flag); int scene_marker_tfm_extend(struct Scene *scene, int delta, int flag, int frame, char side); int scene_marker_tfm_scale(struct Scene *scene, float value, int flag); diff --git a/source/blender/blenkernel/BKE_texture.h b/source/blender/blenkernel/BKE_texture.h index e6a21ec3966..c8fa7a5e81f 100644 --- a/source/blender/blenkernel/BKE_texture.h +++ b/source/blender/blenkernel/BKE_texture.h @@ -81,6 +81,7 @@ void default_mtex(struct MTex *mtex); struct MTex *add_mtex(void); struct MTex *add_mtex_id(struct ID *id, int slot); struct Tex *copy_texture(struct Tex *tex); +struct Tex *localize_texture(struct Tex *tex); void make_local_texture(struct Tex *tex); void autotexname(struct Tex *tex); diff --git a/source/blender/blenkernel/depsgraph_private.h b/source/blender/blenkernel/depsgraph_private.h index 4f99dacbc08..1fed115893c 100644 --- a/source/blender/blenkernel/depsgraph_private.h +++ b/source/blender/blenkernel/depsgraph_private.h @@ -24,6 +24,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file blender/blenkernel/depsgraph_private.h + * \ingroup bke + */ + #ifndef DEPSGRAPH_PRIVATE #define DEPSGRAPH_PRIVATE diff --git a/source/blender/blenkernel/intern/BME_Customdata.c b/source/blender/blenkernel/intern/BME_Customdata.c index d2c00d21df3..512866a6d87 100644 --- a/source/blender/blenkernel/intern/BME_Customdata.c +++ b/source/blender/blenkernel/intern/BME_Customdata.c @@ -34,6 +34,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/BME_Customdata.c + * \ingroup bke + */ + + #include <string.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/BME_conversions.c b/source/blender/blenkernel/intern/BME_conversions.c index 4f1102bb828..4f83d25409a 100644 --- a/source/blender/blenkernel/intern/BME_conversions.c +++ b/source/blender/blenkernel/intern/BME_conversions.c @@ -32,6 +32,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/BME_conversions.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" #include "DNA_meshdata_types.h" diff --git a/source/blender/blenkernel/intern/BME_eulers.c b/source/blender/blenkernel/intern/BME_eulers.c index 9d68866bc99..593f50a65e7 100644 --- a/source/blender/blenkernel/intern/BME_eulers.c +++ b/source/blender/blenkernel/intern/BME_eulers.c @@ -32,6 +32,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/BME_eulers.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" #include "BLI_utildefines.h" diff --git a/source/blender/blenkernel/intern/BME_mesh.c b/source/blender/blenkernel/intern/BME_mesh.c index ca5d0b412ed..62a9601da13 100644 --- a/source/blender/blenkernel/intern/BME_mesh.c +++ b/source/blender/blenkernel/intern/BME_mesh.c @@ -32,6 +32,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/BME_mesh.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" #include "BKE_bmesh.h" diff --git a/source/blender/blenkernel/intern/BME_structure.c b/source/blender/blenkernel/intern/BME_structure.c index 8970e7ff705..1b6c499a9fa 100644 --- a/source/blender/blenkernel/intern/BME_structure.c +++ b/source/blender/blenkernel/intern/BME_structure.c @@ -32,6 +32,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/BME_structure.c + * \ingroup bke + */ + + #include <limits.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c index 2b28fb705fd..7665b581d7e 100644 --- a/source/blender/blenkernel/intern/BME_tools.c +++ b/source/blender/blenkernel/intern/BME_tools.c @@ -31,6 +31,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/BME_tools.c + * \ingroup bke + */ + + #include <math.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/CCGSubSurf.c b/source/blender/blenkernel/intern/CCGSubSurf.c index 3564c93681a..c682b189ae8 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.c +++ b/source/blender/blenkernel/intern/CCGSubSurf.c @@ -1,3 +1,6 @@ +/** \file blender/blenkernel/intern/CCGSubSurf.c + * \ingroup bke + */ /* $Id$ */ #include <stdlib.h> diff --git a/source/blender/blenkernel/intern/CCGSubSurf.h b/source/blender/blenkernel/intern/CCGSubSurf.h index 34d684221b0..363d1e01f98 100644 --- a/source/blender/blenkernel/intern/CCGSubSurf.h +++ b/source/blender/blenkernel/intern/CCGSubSurf.h @@ -1,3 +1,6 @@ +/** \file blender/blenkernel/intern/CCGSubSurf.h + * \ingroup bke + */ /* $Id$ */ typedef void* CCGMeshHDL; diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index ed636e95b96..987f70e67ca 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/DerivedMesh.c + * \ingroup bke + */ + + #include <string.h> diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index 14a0f71f824..1c0091cff74 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -26,6 +26,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/action.c + * \ingroup bke + */ + + #include <string.h> #include <math.h> #include <stdlib.h> @@ -1066,7 +1071,7 @@ void copy_pose_result(bPose *to, bPose *from) bPoseChannel *pchanto, *pchanfrom; if(to==NULL || from==NULL) { - printf("pose result copy error to:%p from:%p\n", to, from); // debug temp + printf("pose result copy error to:%p from:%p\n", (void *)to, (void *)from); // debug temp return; } diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index a8c369a9b7b..39fea333cbc 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/anim.c + * \ingroup bke + */ + + #include <stdio.h> #include <math.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/anim_sys.c b/source/blender/blenkernel/intern/anim_sys.c index 2268a1535bd..d41802598ee 100644 --- a/source/blender/blenkernel/intern/anim_sys.c +++ b/source/blender/blenkernel/intern/anim_sys.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/anim_sys.c + * \ingroup bke + */ + + #include <stdio.h> #include <string.h> #include <stddef.h> @@ -305,7 +310,7 @@ void action_move_fcurves_by_basepath (bAction *srcAct, bAction *dstAct, const ch if ELEM3(NULL, srcAct, dstAct, basepath) { if (G.f & G_DEBUG) { printf("ERROR: action_partition_fcurves_by_basepath(%p, %p, %p) has insufficient info to work with\n", - srcAct, dstAct, basepath); + (void *)srcAct, (void *)dstAct, (void *)basepath); } return; } diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 49c151947a4..99c70564d66 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -25,6 +25,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/armature.c + * \ingroup bke + */ + + #include <ctype.h> #include <stdlib.h> #include <math.h> diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index e34b4bef8d4..f09c6ab9173 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -30,6 +30,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/blender.c + * \ingroup bke + */ + + #ifndef _WIN32 #include <unistd.h> // for read close #else diff --git a/source/blender/blenkernel/intern/bmesh_private.h b/source/blender/blenkernel/intern/bmesh_private.h index b14383378ab..d2b1d9fd566 100644 --- a/source/blender/blenkernel/intern/bmesh_private.h +++ b/source/blender/blenkernel/intern/bmesh_private.h @@ -34,6 +34,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/bmesh_private.h + * \ingroup bke + */ + + #ifndef BMESH_PRIVATE #define BMESH_PRIVATE diff --git a/source/blender/blenkernel/intern/bmfont.c b/source/blender/blenkernel/intern/bmfont.c index 1d4bdf8bf44..6b1f313d88d 100644 --- a/source/blender/blenkernel/intern/bmfont.c +++ b/source/blender/blenkernel/intern/bmfont.c @@ -32,6 +32,11 @@ * */ +/** \file blender/blenkernel/intern/bmfont.c + * \ingroup bke + */ + + /** * Two external functions: * diff --git a/source/blender/blenkernel/intern/boids.c b/source/blender/blenkernel/intern/boids.c index ae4882b0eca..9fb7f6408ac 100644 --- a/source/blender/blenkernel/intern/boids.c +++ b/source/blender/blenkernel/intern/boids.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/boids.c + * \ingroup bke + */ + + #include <string.h> #include <math.h> diff --git a/source/blender/blenkernel/intern/booleanops_mesh.c b/source/blender/blenkernel/intern/booleanops_mesh.c index dd595fc98b6..4e8a3b33827 100644 --- a/source/blender/blenkernel/intern/booleanops_mesh.c +++ b/source/blender/blenkernel/intern/booleanops_mesh.c @@ -1,6 +1,6 @@ #if 0 -/** +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -28,6 +28,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file blender/blenkernel/intern/booleanops_mesh.c + * \ingroup bke + */ + #include "CSG_BooleanOps.h" diff --git a/source/blender/blenkernel/intern/brush.c b/source/blender/blenkernel/intern/brush.c index 15404acc105..f4d117d8a07 100644 --- a/source/blender/blenkernel/intern/brush.c +++ b/source/blender/blenkernel/intern/brush.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/brush.c + * \ingroup bke + */ + + #include <math.h> #include <string.h> @@ -588,7 +593,7 @@ void brush_imbuf_new(Brush *brush, short flt, short texfall, int bufsize, ImBuf dst[2]= FTOCHAR(rgba[2]); dst[3]= FTOCHAR(rgba[3]); } - else { + else if (texfall == 2) { dist = sqrt(xy[0]*xy[0] + xy[1]*xy[1]); brush_sample_tex(brush, xy, rgba, 0); @@ -596,6 +601,14 @@ void brush_imbuf_new(Brush *brush, short flt, short texfall, int bufsize, ImBuf dst[1] = FTOCHAR(rgba[1]*brush->rgb[1]); dst[2] = FTOCHAR(rgba[2]*brush->rgb[2]); dst[3] = FTOCHAR(rgba[3]*alpha*brush_curve_strength_clamp(brush, dist, radius)); + } else { + dist = sqrt(xy[0]*xy[0] + xy[1]*xy[1]); + + brush_sample_tex(brush, xy, rgba, 0); + dst[0]= crgb[0]; + dst[1]= crgb[1]; + dst[2]= crgb[2]; + dst[3] = FTOCHAR(rgba[3]*alpha*brush_curve_strength_clamp(brush, dist, radius)); } } } @@ -865,11 +878,8 @@ static void brush_painter_refresh_cache(BrushPainter *painter, float *pos) flt= cache->flt; size= (cache->size)? cache->size: diameter; - if (!(mtex && mtex->tex) || (mtex->tex->type==0)) { - brush_imbuf_new(brush, flt, 0, size, &cache->ibuf); - } - else if (brush->flag & BRUSH_FIXED_TEX) { - brush_imbuf_new(brush, flt, 0, size, &cache->maskibuf); + if (brush->flag & BRUSH_FIXED_TEX) { + brush_imbuf_new(brush, flt, 3, size, &cache->maskibuf); brush_painter_fixed_tex_partial_update(painter, pos); } else diff --git a/source/blender/blenkernel/intern/bullet.c b/source/blender/blenkernel/intern/bullet.c index 238d3e7f682..72f5e907800 100644 --- a/source/blender/blenkernel/intern/bullet.c +++ b/source/blender/blenkernel/intern/bullet.c @@ -28,6 +28,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/bullet.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" /* types */ diff --git a/source/blender/blenkernel/intern/bvhutils.c b/source/blender/blenkernel/intern/bvhutils.c index 949be31354c..d3afb93b5dd 100644 --- a/source/blender/blenkernel/intern/bvhutils.c +++ b/source/blender/blenkernel/intern/bvhutils.c @@ -27,6 +27,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file blender/blenkernel/intern/bvhutils.c + * \ingroup bke + */ + #include <stdio.h> #include <string.h> #include <math.h> diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 9a04c75db07..407d2ded085 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -30,7 +30,12 @@ * * BKE_cdderivedmesh.h contains the function prototypes for this file. * -*/ +*/ + +/** \file blender/blenkernel/intern/cdderivedmesh.c + * \ingroup bke + */ + /* TODO maybe BIF_gl.h should include string.h? */ #include <string.h> diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index 09f18514277..5eccf724256 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -25,6 +25,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/cloth.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" #include "DNA_cloth_types.h" diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 623ba26e86d..88b6ca296c7 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/collision.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" #include "BKE_cloth.h" diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c index 7cf6b21e2f1..b4c69bddefc 100644 --- a/source/blender/blenkernel/intern/colortools.c +++ b/source/blender/blenkernel/intern/colortools.c @@ -27,6 +27,11 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/colortools.c + * \ingroup bke + */ + + #include <string.h> #include <math.h> #include <stdlib.h> diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 827dddf34d3..ba5b7e3ae4a 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/constraint.c + * \ingroup bke + */ + + #include <stdio.h> #include <stddef.h> #include <string.h> @@ -3069,7 +3074,7 @@ static void rbj_flush_tars (bConstraint *con, ListBase *list, short nocopy) static bConstraintTypeInfo CTI_RIGIDBODYJOINT = { CONSTRAINT_TYPE_RIGIDBODYJOINT, /* type */ sizeof(bRigidBodyJointConstraint), /* size */ - "RigidBody Joint", /* name */ + "Rigid Body Joint", /* name */ "bRigidBodyJointConstraint", /* struct name */ NULL, /* free data */ NULL, /* relink data */ diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c index a80b6dfab7d..710e7a28041 100644 --- a/source/blender/blenkernel/intern/context.c +++ b/source/blender/blenkernel/intern/context.c @@ -25,6 +25,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/context.c + * \ingroup bke + */ + + #include <string.h> #include <stddef.h> diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 5dc62f2c7af..1c11e3010a3 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -30,6 +30,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/curve.c + * \ingroup bke + */ + + #include <math.h> // floor #include <string.h> #include <stdlib.h> diff --git a/source/blender/blenkernel/intern/customdata.c b/source/blender/blenkernel/intern/customdata.c index 87fe545644a..b4d6cf886ec 100644 --- a/source/blender/blenkernel/intern/customdata.c +++ b/source/blender/blenkernel/intern/customdata.c @@ -30,7 +30,12 @@ * * BKE_customdata.h contains the function prototypes for this file. * -*/ +*/ + +/** \file blender/blenkernel/intern/customdata.c + * \ingroup bke + */ + #include <math.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/customdata_file.c b/source/blender/blenkernel/intern/customdata_file.c index 6fb79a0df28..ab639897866 100644 --- a/source/blender/blenkernel/intern/customdata_file.c +++ b/source/blender/blenkernel/intern/customdata_file.c @@ -20,6 +20,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/customdata_file.c + * \ingroup bke + */ + + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -310,11 +315,11 @@ int cdf_read_layer(CDataFile *cdf, CDataFileLayer *blay) return (fseek(cdf->readf, offset, SEEK_SET) == 0); } -int cdf_read_data(CDataFile *cdf, int size, void *data) +int cdf_read_data(CDataFile *cdf, unsigned int size, void *data) { float *fdata; - int a; - + unsigned int a; + /* read data */ if(!fread(data, size, 1, cdf->readf)) return 0; @@ -385,7 +390,7 @@ int cdf_write_layer(CDataFile *UNUSED(cdf), CDataFileLayer *UNUSED(blay)) return 1; } -int cdf_write_data(CDataFile *cdf, int size, void *data) +int cdf_write_data(CDataFile *cdf, unsigned int size, void *data) { /* write data */ if(!fwrite(data, size, 1, cdf->writef)) diff --git a/source/blender/blenkernel/intern/deform.c b/source/blender/blenkernel/intern/deform.c index 7967013c2d4..a81dcfb990f 100644 --- a/source/blender/blenkernel/intern/deform.c +++ b/source/blender/blenkernel/intern/deform.c @@ -32,6 +32,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/deform.c + * \ingroup bke + */ + + #include <string.h> #include <math.h> #include "ctype.h" diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index c437c4fe61f..a4a892a75bb 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -24,6 +24,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file blender/blenkernel/intern/depsgraph.c + * \ingroup bke + */ + #include <stdio.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index b59109c3f2a..35c4fb5311c 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/displist.c + * \ingroup bke + */ + + #include <math.h> #include <stdio.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index ddfc58b7491..f07dd0bc5f4 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/effect.c + * \ingroup bke + */ + + #include <stddef.h> #include "BLI_storage.h" /* _LARGEFILE_SOURCE */ diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index 4a6638ff3a0..c749655cdc2 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -31,6 +31,11 @@ * ***** END GPL LICENSE BLOCK **** */ +/** \file blender/blenkernel/intern/exotic.c + * \ingroup bke + */ + + #include <stddef.h> #include "BLI_storage.h" diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c index b50943ba9f1..a1ed16fc1e5 100644 --- a/source/blender/blenkernel/intern/fcurve.c +++ b/source/blender/blenkernel/intern/fcurve.c @@ -26,6 +26,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file blender/blenkernel/intern/fcurve.c + * \ingroup bke + */ + #include <math.h> diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c index bb56a5b176a..1c2f1c8487c 100644 --- a/source/blender/blenkernel/intern/fluidsim.c +++ b/source/blender/blenkernel/intern/fluidsim.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/fluidsim.c + * \ingroup bke + */ + + #include <stddef.h> #include "BLI_storage.h" /* _LARGEFILE_SOURCE */ diff --git a/source/blender/blenkernel/intern/fmodifier.c b/source/blender/blenkernel/intern/fmodifier.c index f979973f55d..25d6860cb50 100644 --- a/source/blender/blenkernel/intern/fmodifier.c +++ b/source/blender/blenkernel/intern/fmodifier.c @@ -25,6 +25,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/fmodifier.c + * \ingroup bke + */ + + #include <math.h> #include <stdio.h> diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index bf0427e4fee..b521dbad17a 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/font.c + * \ingroup bke + */ + + #include <stdio.h> #include <string.h> #include <math.h> diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index abd7c12ff70..db0c9d2735f 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -24,6 +24,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file blender/blenkernel/intern/gpencil.c + * \ingroup bke + */ + #include <stdio.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c index e48ec8ac288..d96b00f7990 100644 --- a/source/blender/blenkernel/intern/group.c +++ b/source/blender/blenkernel/intern/group.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/group.c + * \ingroup bke + */ + + #include <stdio.h> #include <string.h> #include <math.h> diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c index 8ce3847bf08..09c189a8847 100644 --- a/source/blender/blenkernel/intern/icons.c +++ b/source/blender/blenkernel/intern/icons.c @@ -28,6 +28,11 @@ * */ +/** \file blender/blenkernel/intern/icons.c + * \ingroup bke + */ + + #include <math.h> #include <stdlib.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c index c63d1e45da8..1b3d43e1f49 100644 --- a/source/blender/blenkernel/intern/idcode.c +++ b/source/blender/blenkernel/intern/idcode.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** * return info about ID types */ + +/** \file blender/blenkernel/intern/idcode.c + * \ingroup bke + */ + #include <stdlib.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index b3119f317a5..40d12e06320 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -24,6 +24,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file blender/blenkernel/intern/idprop.c + * \ingroup bke + */ + #include <stdio.h> #include <stdlib.h> diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 8a15f63243c..bbcc2862900 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -26,6 +26,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/image.c + * \ingroup bke + */ + + #include <stdio.h> #include <string.h> #include <fcntl.h> diff --git a/source/blender/blenkernel/intern/image_gen.c b/source/blender/blenkernel/intern/image_gen.c index c21e347d6d8..1a1b073352e 100644 --- a/source/blender/blenkernel/intern/image_gen.c +++ b/source/blender/blenkernel/intern/image_gen.c @@ -23,6 +23,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/image_gen.c + * \ingroup bke + */ + + #include <math.h> #include <stdlib.h> diff --git a/source/blender/blenkernel/intern/implicit.c b/source/blender/blenkernel/intern/implicit.c index 207c667f335..7f0292b2f22 100644 --- a/source/blender/blenkernel/intern/implicit.c +++ b/source/blender/blenkernel/intern/implicit.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/implicit.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" #include "DNA_scene_types.h" diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 329058b3115..92098d59e0e 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -28,6 +28,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/ipo.c + * \ingroup bke + */ + + /* NOTE: * * This file is no longer used to provide tools for the depreceated IPO system. Instead, it diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index 3681dc910cd..f8c7a71f210 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -30,6 +30,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/key.c + * \ingroup bke + */ + + #include <math.h> #include <string.h> #include <stddef.h> diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index b0f90ef8042..091c4a2fe50 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -30,6 +30,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/lattice.c + * \ingroup bke + */ + + #include <stdio.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index eab99eca7df..68123360a5f 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/library.c + * \ingroup bke + */ + + /* * Contains management of ID's and libraries * allocate and free of all library data @@ -105,6 +110,10 @@ #include "BKE_fcurve.h" #include "BKE_linestyle.h" +#ifdef WITH_PYTHON +#include "BPY_extern.h" +#endif + #define MAX_IDPUP 60 /* was 24 */ /* GS reads the memory pointed at in a specific ordering. @@ -727,7 +736,11 @@ static void animdata_dtar_clear_cb(ID *UNUSED(id), AnimData *adt, void *userdata void free_libblock(ListBase *lb, void *idv) { ID *id= idv; - + +#ifdef WITH_PYTHON + BPY_id_release(id); +#endif + switch( GS(id->name) ) { /* GetShort from util.h */ case ID_SCE: free_scene((Scene *)id); diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index f56c72669e8..e368c9b3bde 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -30,6 +30,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/material.c + * \ingroup bke + */ + + #include <string.h> #include <math.h> diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 4f44875b7ea..dd96736b8c3 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -32,6 +32,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/mball.c + * \ingroup bke + */ + + #include <stdio.h> #include <string.h> #include <math.h> diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 3c56cb4663b..247e48a5576 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/mesh.c + * \ingroup bke + */ + + #include <stdlib.h> #include <string.h> #include <stdio.h> diff --git a/source/blender/blenkernel/intern/mesh_validate.c b/source/blender/blenkernel/intern/mesh_validate.c index 8b0b7a041dc..7c38688c82e 100644 --- a/source/blender/blenkernel/intern/mesh_validate.c +++ b/source/blender/blenkernel/intern/mesh_validate.c @@ -23,6 +23,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/mesh_validate.c + * \ingroup bke + */ + + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -112,7 +117,7 @@ static int search_face_cmp(const void *v1, const void *v2) } -int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), int totvert, MEdge *medges, int totedge, MFace *mfaces, int totface, const short do_verbose, const short do_fixes) +int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), unsigned int totvert, MEdge *medges, unsigned int totedge, MFace *mfaces, unsigned int totface, const short do_verbose, const short do_fixes) { # define PRINT if(do_verbose) printf # define REMOVE_EDGE_TAG(_med) { _med->v2= _med->v1; do_edge_free= 1; } @@ -122,7 +127,7 @@ int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), int totvert, MEdge MEdge *med; MFace *mf; MFace *mf_prev; - int i; + unsigned int i; int do_face_free= FALSE; int do_edge_free= FALSE; @@ -134,7 +139,7 @@ int BKE_mesh_validate_arrays(Mesh *me, MVert *UNUSED(mverts), int totvert, MEdge SortFace *sort_faces= MEM_callocN(sizeof(SortFace) * totface, "search faces"); SortFace *sf; SortFace *sf_prev; - int totsortface= 0; + unsigned int totsortface= 0; BLI_assert(!(do_fixes && me == NULL)); diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index 7439a47a746..51f1cd61e7c 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -34,6 +34,11 @@ * */ +/** \file blender/blenkernel/intern/modifier.c + * \ingroup bke + */ + + #include <stddef.h> #include <string.h> #include <stdarg.h> diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 29726ccbc99..5706a3997e6 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/multires.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" #include "DNA_mesh_types.h" diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c index df012c47f66..6694f74cd1e 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/nla.c + * \ingroup bke + */ + + #include <stdlib.h> #include <stddef.h> #include <stdio.h> @@ -1494,7 +1499,7 @@ short BKE_nla_tweakmode_enter (AnimData *adt) if ELEM3(NULL, activeTrack, activeStrip, activeStrip->act) { if (G.f & G_DEBUG) { printf("NLA tweakmode enter - neither active requirement found \n"); - printf("\tactiveTrack = %p, activeStrip = %p \n", activeTrack, activeStrip); + printf("\tactiveTrack = %p, activeStrip = %p \n", (void *)activeTrack, (void *)activeStrip); } return 0; } diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 320bead1c61..1f8cd1ca152 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/node.c + * \ingroup bke + */ + + #ifdef WITH_PYTHON #include <Python.h> #endif @@ -1183,6 +1188,12 @@ bNodeTree *ntreeCopyTree(bNodeTree *ntree) newtree= MEM_dupallocN(ntree); copy_libblock_data(&newtree->id, &ntree->id, TRUE); /* copy animdata and ID props */ } + + /* in case a running nodetree is copied */ + newtree->init &= ~(NTREE_EXEC_INIT); + newtree->threadstack= NULL; + newtree->stack= NULL; + newtree->nodes.first= newtree->nodes.last= NULL; newtree->links.first= newtree->links.last= NULL; @@ -2766,8 +2777,8 @@ void ntreeCompositExecTree(bNodeTree *ntree, RenderData *rd, int do_preview) /* ********** copy composite tree entirely, to allow threaded exec ******************* */ /* ***************** do NOT execute this in a thread! ****************** */ -/* returns localized composite tree for execution in threads */ -/* local tree then owns all compbufs */ +/* returns localized tree for execution in threads */ +/* local tree then owns all compbufs (for composite) */ bNodeTree *ntreeLocalize(bNodeTree *ntree) { bNodeTree *ltree; @@ -2804,16 +2815,17 @@ bNodeTree *ntreeLocalize(bNodeTree *ntree) /* end animdata uglyness */ /* ensures only a single output node is enabled */ - ntreeSetOutput(ntree); + ntreeSetOutput(ltree); for(node= ntree->nodes.first; node; node= node->next) { /* store new_node pointer to original */ node->new_node->new_node= node; - /* ensure new user input gets handled ok */ - node->need_exec= 0; if(ntree->type==NTREE_COMPOSIT) { + /* ensure new user input gets handled ok, only composites (texture nodes will break, for painting since it uses no tags) */ + node->need_exec= 0; + /* move over the compbufs */ /* right after ntreeCopyTree() oldsock pointers are valid */ @@ -2881,7 +2893,7 @@ void ntreeLocalSync(bNodeTree *localtree, bNodeTree *ntree) } } } - else if(ntree->type==NTREE_SHADER) { + else if(ELEM(ntree->type, NTREE_SHADER, NTREE_TEXTURE)) { /* copy over contents of previews */ for(lnode= localtree->nodes.first; lnode; lnode= lnode->next) { if(node_exists(ntree, lnode->new_node)) { diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index a65681ae6e4..41d3628a578 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/object.c + * \ingroup bke + */ + + #include <string.h> #include <math.h> #include <stdio.h> @@ -1416,7 +1421,7 @@ void make_local_object(Object *ob) if(ob->id.us==1) { ob->id.lib= NULL; ob->id.flag= LIB_LOCAL; - new_id(0, (ID *)ob, 0); + new_id(NULL, (ID *)ob, NULL); } else { @@ -1435,9 +1440,9 @@ void make_local_object(Object *ob) } if(local && lib==0) { - ob->id.lib= 0; + ob->id.lib= NULL; ob->id.flag= LIB_LOCAL; - new_id(0, (ID *)ob, 0); + new_id(NULL, (ID *)ob, NULL); } else if(local && lib) { obn= copy_object(ob); @@ -1445,7 +1450,7 @@ void make_local_object(Object *ob) sce= bmain->scene.first; while(sce) { - if(sce->id.lib==0) { + if(sce->id.lib==NULL) { base= sce->base.first; while(base) { if(base->object==ob) { diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index 981b3b31e71..ed729d819b7 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/packedFile.c + * \ingroup bke + */ + + #include <stdio.h> #include <fcntl.h> #include <sys/stat.h> diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index e53888127f2..5be492d1108 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/paint.c + * \ingroup bke + */ + + #include "DNA_object_types.h" #include "DNA_mesh_types.h" diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 4609e64c271..48c29d5e96f 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/particle.c + * \ingroup bke + */ + + #include <stdlib.h> #include <math.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index fd792168c6b..336b683e26b 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/particle_system.c + * \ingroup bke + */ + + #include <stddef.h> #include "BLI_storage.h" /* _LARGEFILE_SOURCE */ diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 6ea14606660..c70a02ac457 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -25,6 +25,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/pointcache.c + * \ingroup bke + */ + + #include <stdlib.h> #include <stdio.h> #include <string.h> @@ -1393,7 +1398,7 @@ static PTCacheMem *ptcache_disk_frame_to_mem(PTCacheID *pid, int cfra) unsigned int i, error = 0; if(pf == NULL) - return 0; + return NULL; if(!ptcache_file_header_begin_read(pf)) error = 1; diff --git a/source/blender/blenkernel/intern/property.c b/source/blender/blenkernel/intern/property.c index e907b628242..d0e4832889b 100644 --- a/source/blender/blenkernel/intern/property.c +++ b/source/blender/blenkernel/intern/property.c @@ -30,6 +30,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/property.c + * \ingroup bke + */ + + #include <stdio.h> #include <stdlib.h> #include <stddef.h> diff --git a/source/blender/blenkernel/intern/report.c b/source/blender/blenkernel/intern/report.c index fa2e867d483..ed3739e897d 100644 --- a/source/blender/blenkernel/intern/report.c +++ b/source/blender/blenkernel/intern/report.c @@ -25,6 +25,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/report.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c index c004e254572..38dc7fd5106 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -29,6 +29,11 @@ * all data is 'direct data', not Blender lib data. */ +/** \file blender/blenkernel/intern/sca.c + * \ingroup bke + */ + + #include <stdio.h> #include <string.h> #include <float.h> diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 84869fde206..4688ded87c1 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/scene.c + * \ingroup bke + */ + + #include <stddef.h> #include <stdio.h> #include <string.h> @@ -836,7 +841,7 @@ char *scene_find_last_marker_name(Scene *scene, int frame) /* markers need transforming from different parts of the code so have * a generic function to do this */ -int scene_marker_tfm_translate(Scene *scene, int delta, int flag) +int scene_marker_tfm_translate(Scene *scene, int delta, unsigned int flag) { TimeMarker *marker; int tot= 0; diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index 58900e603e3..d8219b61816 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/screen.c + * \ingroup bke + */ + + #include <string.h> #include <stdio.h> #include <math.h> diff --git a/source/blender/blenkernel/intern/script.c b/source/blender/blenkernel/intern/script.c index 6ffac09e843..77153fc37ba 100644 --- a/source/blender/blenkernel/intern/script.c +++ b/source/blender/blenkernel/intern/script.c @@ -31,6 +31,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/script.c + * \ingroup bke + */ + + #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c index df81bcd1593..e698402c538 100644 --- a/source/blender/blenkernel/intern/seqcache.c +++ b/source/blender/blenkernel/intern/seqcache.c @@ -22,6 +22,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/seqcache.c + * \ingroup bke + */ + + #include <stddef.h> #include <stdlib.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/seqeffects.c b/source/blender/blenkernel/intern/seqeffects.c index 7ddd1fbd6bb..36c82a3c6fc 100644 --- a/source/blender/blenkernel/intern/seqeffects.c +++ b/source/blender/blenkernel/intern/seqeffects.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/seqeffects.c + * \ingroup bke + */ + + #include <string.h> #include <math.h> #include <stdlib.h> diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c index 83e28db771a..c8c5ab921fa 100644 --- a/source/blender/blenkernel/intern/sequencer.c +++ b/source/blender/blenkernel/intern/sequencer.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/sequencer.c + * \ingroup bke + */ + + #include <stddef.h> #include <stdlib.h> #include <string.h> diff --git a/source/blender/blenkernel/intern/shrinkwrap.c b/source/blender/blenkernel/intern/shrinkwrap.c index 53fefa685b9..5b6c6bf8732 100644 --- a/source/blender/blenkernel/intern/shrinkwrap.c +++ b/source/blender/blenkernel/intern/shrinkwrap.c @@ -26,6 +26,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file blender/blenkernel/intern/shrinkwrap.c + * \ingroup bke + */ + #include <string.h> #include <float.h> #include <math.h> @@ -553,7 +558,7 @@ void shrinkwrapModifier_deform(ShrinkwrapModifierData *smd, Object *ob, DerivedM //Using vertexs positions/normals as if a subsurface was applied if(smd->subsurfLevels) { - SubsurfModifierData ssmd= {{0}}; + SubsurfModifierData ssmd= {{NULL}}; ssmd.subdivType = ME_CC_SUBSURF; //catmull clark ssmd.levels = smd->subsurfLevels; //levels diff --git a/source/blender/blenkernel/intern/sketch.c b/source/blender/blenkernel/intern/sketch.c index 8917d2946bd..6e234a9d115 100644 --- a/source/blender/blenkernel/intern/sketch.c +++ b/source/blender/blenkernel/intern/sketch.c @@ -23,6 +23,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/sketch.c + * \ingroup bke + */ + + #include <string.h> #include <math.h> #include <float.h> diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index b2d3ddf2e52..90581870070 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/smoke.c + * \ingroup bke + */ + + /* Part of the code copied from elbeem fluid library, copyright by Nils Thuerey */ #include <GL/glew.h> diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index ca8df76311d..0578b155272 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -28,6 +28,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/softbody.c + * \ingroup bke + */ + + /* ****** variables on the UI for now diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c index 9c157f57d49..cfc98b4a67d 100644 --- a/source/blender/blenkernel/intern/sound.c +++ b/source/blender/blenkernel/intern/sound.c @@ -1,3 +1,6 @@ +/** \file blender/blenkernel/intern/sound.c + * \ingroup bke + */ /** * sound.c (mar-2001 nzc) * diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 5697c29db5d..54bd4a86a5e 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/subsurf_ccg.c + * \ingroup bke + */ + + #include <stdlib.h> #include <string.h> #include <stdio.h> @@ -1359,7 +1364,7 @@ static void ccgDM_drawMappedFacesGLSL(DerivedMesh *dm, int (*setMaterial)(int, v CCGSubSurf *ss = ccgdm->ss; CCGFaceIterator *fi = ccgSubSurf_getFaceIterator(ss); GPUVertexAttribs gattribs; - DMVertexAttribs attribs= {{{0}}}; + DMVertexAttribs attribs= {{{NULL}}}; MTFace *tf = dm->getFaceDataArray(dm, CD_MTFACE); int gridSize = ccgSubSurf_getGridSize(ss); int gridFaces = gridSize - 1; diff --git a/source/blender/blenkernel/intern/suggestions.c b/source/blender/blenkernel/intern/suggestions.c index 052b545cfb4..8a8bb6dd76a 100644 --- a/source/blender/blenkernel/intern/suggestions.c +++ b/source/blender/blenkernel/intern/suggestions.c @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/suggestions.c + * \ingroup bke + */ + + #include <stdlib.h> #include <string.h> #include <ctype.h> diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index 1bd41c7aa86..a8709163c7b 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/text.c + * \ingroup bke + */ + + #include <string.h> /* strstr */ #include <sys/types.h> #include <sys/stat.h> diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index c22b1d32849..5199bbd0f06 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -29,6 +29,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/texture.c + * \ingroup bke + */ + + #include <stdio.h> #include <stdlib.h> #include <string.h> @@ -475,11 +480,13 @@ int colorband_element_remove(struct ColorBand *coba, int index) void free_texture(Tex *tex) { free_plugin_tex(tex->plugin); + if(tex->coba) MEM_freeN(tex->coba); if(tex->env) BKE_free_envmap(tex->env); if(tex->pd) BKE_free_pointdensity(tex->pd); if(tex->vd) BKE_free_voxeldata(tex->vd); BKE_free_animdata((struct ID *)tex); + BKE_previewimg_free(&tex->preview); BKE_icon_delete((struct ID*)tex); tex->id.icon_id = 0; @@ -745,10 +752,6 @@ Tex *copy_texture(Tex *tex) if(texn->type==TEX_IMAGE) id_us_plus((ID *)texn->ima); else texn->ima= NULL; -#if 0 // XXX old animation system - id_us_plus((ID *)texn->ipo); -#endif // XXX old animation system - if(texn->plugin) { texn->plugin= MEM_dupallocN(texn->plugin); open_plugin_tex(texn->plugin); @@ -763,12 +766,42 @@ Tex *copy_texture(Tex *tex) if(tex->nodetree) { ntreeEndExecTree(tex->nodetree); - texn->nodetree= ntreeCopyTree(tex->nodetree); /* 0 == full new tree */ + texn->nodetree= ntreeCopyTree(tex->nodetree); + } + + return texn; +} + +/* texture copy without adding to main dbase */ +Tex *localize_texture(Tex *tex) +{ + Tex *texn; + + texn= copy_libblock(tex); + BLI_remlink(&G.main->tex, texn); + + /* image texture: free_texture also doesn't decrease */ + + if(texn->plugin) { + texn->plugin= MEM_dupallocN(texn->plugin); + open_plugin_tex(texn->plugin); + } + + if(texn->coba) texn->coba= MEM_dupallocN(texn->coba); + if(texn->env) texn->env= BKE_copy_envmap(texn->env); + if(texn->pd) texn->pd= MEM_dupallocN(texn->pd); + if(texn->vd) texn->vd= MEM_dupallocN(texn->vd); + + texn->preview = NULL; + + if(tex->nodetree) { + texn->nodetree= ntreeLocalize(tex->nodetree); } return texn; } + /* ------------------------------------------------------------------------- */ void make_local_texture(Tex *tex) diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c index b071f2c9da5..d4084412f63 100644 --- a/source/blender/blenkernel/intern/unit.c +++ b/source/blender/blenkernel/intern/unit.c @@ -21,6 +21,11 @@ * * ***** END GPL LICENSE BLOCK ***** */ + +/** \file blender/blenkernel/intern/unit.c + * \ingroup bke + */ + #include <stdlib.h> #include <stdio.h> #include <ctype.h> diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 5412e44f0eb..ff58e8bd0a4 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -30,6 +30,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/intern/world.c + * \ingroup bke + */ + + #include <string.h> #include <math.h> #include "MEM_guardedalloc.h" @@ -155,7 +160,7 @@ void make_local_world(World *wrld) } if(local && lib==0) { - wrld->id.lib= 0; + wrld->id.lib= NULL; wrld->id.flag= LIB_LOCAL; new_id(NULL, (ID *)wrld, NULL); } diff --git a/source/blender/blenkernel/intern/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index 1c1febf2609..73e23bd2a05 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -31,6 +31,11 @@ * */ +/** \file blender/blenkernel/intern/writeavi.c + * \ingroup bke + */ + + #include <string.h> #include "MEM_guardedalloc.h" diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index f3b759113ff..9b1c3b2ddb8 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -1,3 +1,6 @@ +/** \file blender/blenkernel/intern/writeffmpeg.c + * \ingroup bke + */ /* * $Id$ * diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c index 3cb3d7e038b..2239f6d3147 100644 --- a/source/blender/blenkernel/intern/writeframeserver.c +++ b/source/blender/blenkernel/intern/writeframeserver.c @@ -1,3 +1,6 @@ +/** \file blender/blenkernel/intern/writeframeserver.c + * \ingroup bke + */ /* * $Id$ * diff --git a/source/blender/blenkernel/nla_private.h b/source/blender/blenkernel/nla_private.h index dae9c4f6e41..2db288192cc 100644 --- a/source/blender/blenkernel/nla_private.h +++ b/source/blender/blenkernel/nla_private.h @@ -27,6 +27,11 @@ * ***** END GPL LICENSE BLOCK ***** */ +/** \file blender/blenkernel/nla_private.h + * \ingroup bke + */ + + #ifndef NLA_PRIVATE #define NLA_PRIVATE |