[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46406] branches/meshdata_transfer: svn merge ^/trunk/blender -r46370:46380
Ove Murberg Henriksen
sorayasilvermoon at hotmail.com
Tue May 8 02:09:02 CEST 2012
Revision: 46406
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46406
Author: cyborgmuppet
Date: 2012-05-08 00:09:00 +0000 (Tue, 08 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46370:46380
1 Tree conflict
I deleted the source/tools/GL and then ran:
svn -r46380 co https://svn.blender.org/svnroot/bf-blender/trunk/blender/source/tools/GL
svn resolve --accept working -R source/tools/GL
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46370
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46380
Modified Paths:
--------------
branches/meshdata_transfer/intern/SConscript
branches/meshdata_transfer/source/blender/blenkernel/BKE_displist.h
branches/meshdata_transfer/source/blender/blenkernel/BKE_mball.h
branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c
branches/meshdata_transfer/source/blender/blenkernel/intern/armature.c
branches/meshdata_transfer/source/blender/blenkernel/intern/constraint.c
branches/meshdata_transfer/source/blender/blenkernel/intern/curve.c
branches/meshdata_transfer/source/blender/blenkernel/intern/depsgraph.c
branches/meshdata_transfer/source/blender/blenkernel/intern/displist.c
branches/meshdata_transfer/source/blender/blenkernel/intern/effect.c
branches/meshdata_transfer/source/blender/blenkernel/intern/font.c
branches/meshdata_transfer/source/blender/blenkernel/intern/lattice.c
branches/meshdata_transfer/source/blender/blenkernel/intern/library.c
branches/meshdata_transfer/source/blender/blenkernel/intern/material.c
branches/meshdata_transfer/source/blender/blenkernel/intern/mball.c
branches/meshdata_transfer/source/blender/blenkernel/intern/movieclip.c
branches/meshdata_transfer/source/blender/blenkernel/intern/object.c
branches/meshdata_transfer/source/blender/blenkernel/intern/particle.c
branches/meshdata_transfer/source/blender/blenkernel/intern/tracking.c
branches/meshdata_transfer/source/blender/collada/MeshImporter.cpp
branches/meshdata_transfer/source/blender/editors/mesh/editmesh_select.c
branches/meshdata_transfer/source/blender/editors/metaball/mball_edit.c
branches/meshdata_transfer/source/blender/editors/object/object_add.c
branches/meshdata_transfer/source/blender/editors/object/object_edit.c
branches/meshdata_transfer/source/blender/editors/object/object_modifier.c
branches/meshdata_transfer/source/blender/editors/object/object_relations.c
branches/meshdata_transfer/source/blender/editors/object/object_transform.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_buttons.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_draw.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_editor.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_graph_draw.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_graph_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_ops.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_toolbar.c
branches/meshdata_transfer/source/blender/editors/space_clip/clip_utils.c
branches/meshdata_transfer/source/blender/editors/space_clip/space_clip.c
branches/meshdata_transfer/source/blender/editors/space_clip/tracking_ops.c
branches/meshdata_transfer/source/blender/editors/space_info/info_stats.c
branches/meshdata_transfer/source/blender/editors/space_view3d/drawobject.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_main_api.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_meta.c
branches/meshdata_transfer/source/blender/makesrna/intern/rna_object_api.c
branches/meshdata_transfer/source/blender/modifiers/intern/MOD_array.c
branches/meshdata_transfer/source/blender/python/mathutils/mathutils_geometry.c
branches/meshdata_transfer/source/blender/render/intern/source/convertblender.c
branches/meshdata_transfer/source/blender/windowmanager/intern/wm_init_exit.c
Property Changed:
----------------
branches/meshdata_transfer/
branches/meshdata_transfer/source/blender/editors/interface/interface.c
branches/meshdata_transfer/source/blender/editors/space_outliner/
Property changes on: branches/meshdata_transfer
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200,46301-46370
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037
/trunk/blender:44563-46200,46301-46380
Modified: branches/meshdata_transfer/intern/SConscript
===================================================================
--- branches/meshdata_transfer/intern/SConscript 2012-05-07 23:40:17 UTC (rev 46405)
+++ branches/meshdata_transfer/intern/SConscript 2012-05-08 00:09:00 UTC (rev 46406)
@@ -16,25 +16,16 @@
'mikktspace/SConscript',
'smoke/SConscript'])
-# NEW_CSG was intended for intern/csg, but
-# getting it to compile is difficult
-# intern/bsp has been used anyway, so
-# perhaps get rid of intern/csg?
-NEW_CSG = 'false'
-
if env ['WITH_BF_REMESH']:
SConscript(['dualcon/SConscript'])
if env['WITH_BF_FLUID']:
SConscript(['elbeem/SConscript'])
-
+
if env['WITH_BF_CYCLES']:
SConscript(['cycles/SConscript'])
-if NEW_CSG == 'false':
- SConscript(['bsp/SConscript'])
-else:
- SConscript(['csg/SConscript'])
+SConscript(['bsp/SConscript'])
if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'win64-mingw', 'linuxcross', 'win64-vc'):
SConscript(['utfconv/SConscript'])
Modified: branches/meshdata_transfer/source/blender/blenkernel/BKE_displist.h
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/BKE_displist.h 2012-05-07 23:40:17 UTC (rev 46405)
+++ branches/meshdata_transfer/source/blender/blenkernel/BKE_displist.h 2012-05-08 00:09:00 UTC (rev 46406)
@@ -78,29 +78,28 @@
unsigned int *bevelSplitFlag;
} DispList;
-extern void copy_displist(struct ListBase *lbn, struct ListBase *lb);
-extern void free_disp_elem(DispList *dl);
-extern DispList *find_displist_create(struct ListBase *lb, int type);
-extern DispList *find_displist(struct ListBase *lb, int type);
-extern void addnormalsDispList(struct ListBase *lb);
-extern void count_displist(struct ListBase *lb, int *totvert, int *totface);
-extern void freedisplist(struct ListBase *lb);
-extern int displist_has_faces(struct ListBase *lb);
+void BKE_displist_copy(struct ListBase *lbn, struct ListBase *lb);
+void BKE_displist_elem_free(DispList *dl);
+DispList *BKE_displist_find_or_create(struct ListBase *lb, int type);
+DispList *BKE_displist_find(struct ListBase *lb, int type);
+void BKE_displist_normals_add(struct ListBase *lb);
+void BKE_displist_count(struct ListBase *lb, int *totvert, int *totface);
+void BKE_displist_free(struct ListBase *lb);
+int BKE_displist_has_faces(struct ListBase *lb);
-extern void makeDispListSurf(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, struct DerivedMesh **derivedFinal, int forRender, int forOrco);
-extern void makeDispListCurveTypes(struct Scene *scene, struct Object *ob, int forOrco);
-extern void makeDispListCurveTypes_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, struct DerivedMesh **derivedFinal, int forOrco);
-extern void makeDispListCurveTypes_forOrco(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
-extern void makeDispListMBall(struct Scene *scene, struct Object *ob);
-extern void makeDispListMBall_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
+void BKE_displist_make_surf(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, struct DerivedMesh **derivedFinal, int forRender, int forOrco);
+void BKE_displist_make_curveTypes(struct Scene *scene, struct Object *ob, int forOrco);
+void BKE_displist_make_curveTypes_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase, struct DerivedMesh **derivedFinal, int forOrco);
+void BKE_displist_make_curveTypes_forOrco(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
+void BKE_displist_make_mball(struct Scene *scene, struct Object *ob);
+void BKE_displist_make_mball_forRender(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
-int surfindex_displist(DispList *dl, int a, int *b, int *p1, int *p2, int *p3, int *p4);
-void filldisplist(struct ListBase *dispbase, struct ListBase *to, int flipnormal);
+int BKE_displist_surfindex_get(DispList *dl, int a, int *b, int *p1, int *p2, int *p3, int *p4);
+void BKE_displist_fill(struct ListBase *dispbase, struct ListBase *to, int flipnormal);
-float calc_taper(struct Scene *scene, struct Object *taperobj, int cur, int tot);
+float BKE_displist_calc_taper(struct Scene *scene, struct Object *taperobj, int cur, int tot);
/* add Orco layer to the displist object which has got derived mesh and return orco */
-float *makeOrcoDispList(struct Scene *scene, struct Object *ob, struct DerivedMesh *derivedFinal, int forRender);
+float *BKE_displist_make_orco(struct Scene *scene, struct Object *ob, struct DerivedMesh *derivedFinal, int forRender);
#endif
-
Modified: branches/meshdata_transfer/source/blender/blenkernel/BKE_mball.h
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/BKE_mball.h 2012-05-07 23:40:17 UTC (rev 46405)
+++ branches/meshdata_transfer/source/blender/blenkernel/BKE_mball.h 2012-05-08 00:09:00 UTC (rev 46406)
@@ -37,30 +37,30 @@
struct Scene;
struct MetaElem;
-void BKE_metaball_unlink(struct MetaBall *mb);
-void BKE_metaball_free(struct MetaBall *mb);
-struct MetaBall *BKE_metaball_add(const char *name);
-struct MetaBall *BKE_metaball_copy(struct MetaBall *mb);
+void BKE_mball_unlink(struct MetaBall *mb);
+void BKE_mball_free(struct MetaBall *mb);
+struct MetaBall *BKE_mball_add(const char *name);
+struct MetaBall *BKE_mball_copy(struct MetaBall *mb);
-void BKE_metaball_make_local(struct MetaBall *mb);
+void BKE_mball_make_local(struct MetaBall *mb);
-void BKE_metaball_cubeTable_free(void);
+void BKE_mball_cubeTable_free(void);
-void BKE_metaball_polygonize(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
-int BKE_metaball_is_basis_for(struct Object *ob1, struct Object *ob2);
-int BKE_metaball_is_basis(struct Object *ob);
-struct Object *BKE_metaball_basis_find(struct Scene *scene, struct Object *ob);
+void BKE_mball_polygonize(struct Scene *scene, struct Object *ob, struct ListBase *dispbase);
+int BKE_mball_is_basis_for(struct Object *ob1, struct Object *ob2);
+int BKE_mball_is_basis(struct Object *ob);
+struct Object *BKE_mball_basis_find(struct Scene *scene, struct Object *ob);
-void BKE_metaball_texspace_calc(struct Object *ob);
-float *BKE_metaball_make_orco(struct Object *ob, struct ListBase *dispbase);
+void BKE_mball_texspace_calc(struct Object *ob);
+float *BKE_mball_make_orco(struct Object *ob, struct ListBase *dispbase);
-void BKE_metaball_properties_copy(struct Scene *scene, struct Object *active_object);
+void BKE_mball_properties_copy(struct Scene *scene, struct Object *active_object);
-int BKE_metaball_minmax(struct MetaBall *mb, float min[3], float max[3]);
-int BKE_metaball_center_median(struct MetaBall *mb, float cent[3]);
-int BKE_metaball_center_bounds(struct MetaBall *mb, float cent[3]);
-void BKE_metaball_translate(struct MetaBall *mb, float offset[3]);
+int BKE_mball_minmax(struct MetaBall *mb, float min[3], float max[3]);
+int BKE_mball_center_median(struct MetaBall *mb, float cent[3]);
+int BKE_mball_center_bounds(struct MetaBall *mb, float cent[3]);
+void BKE_mball_translate(struct MetaBall *mb, float offset[3]);
-struct MetaElem *BKE_metaball_element_add(struct MetaBall *mb, const int type);
+struct MetaElem *BKE_mball_element_add(struct MetaBall *mb, const int type);
#endif
Modified: branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c 2012-05-07 23:40:17 UTC (rev 46405)
+++ branches/meshdata_transfer/source/blender/blenkernel/intern/DerivedMesh.c 2012-05-08 00:09:00 UTC (rev 46406)
@@ -2097,7 +2097,7 @@
me->bb = NULL;
}
- freedisplist(&ob->disp);
+ BKE_displist_free(&ob->disp);
if (ob->derivedFinal) {
ob->derivedFinal->needsFree = 1;
Modified: branches/meshdata_transfer/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/intern/armature.c 2012-05-07 23:40:17 UTC (rev 46405)
+++ branches/meshdata_transfer/source/blender/blenkernel/intern/armature.c 2012-05-08 00:09:00 UTC (rev 46406)
@@ -1818,7 +1818,7 @@
/* only happens on reload file, but violates depsgraph still... fix! */
if ((cu->path == NULL) || (cu->path->data == NULL))
- makeDispListCurveTypes(scene, ikData->tar, 0);
+ BKE_displist_make_curveTypes(scene, ikData->tar, 0);
}
/* find the root bone and the chain of bones from the root to the tip
Modified: branches/meshdata_transfer/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/meshdata_transfer/source/blender/blenkernel/intern/constraint.c 2012-05-07 23:40:17 UTC (rev 46405)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list