[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14569] branches/apricot:
Brecht Van Lommel
brechtvanlommel at pandora.be
Sun Apr 27 20:45:33 CEST 2008
Revision: 14569
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14569
Author: blendix
Date: 2008-04-27 20:45:33 +0200 (Sun, 27 Apr 2008)
Log Message:
-----------
Apricot Branch
==============
svn merge -r 14561:14567
Modified Paths:
--------------
branches/apricot/SConstruct
branches/apricot/extern/ffmpeg/SConscript
branches/apricot/extern/x264/SConscript
branches/apricot/source/blender/blenkernel/BKE_effect.h
branches/apricot/source/blender/blenkernel/BKE_multires.h
branches/apricot/source/blender/blenkernel/intern/DerivedMesh.c
branches/apricot/source/blender/blenkernel/intern/action.c
branches/apricot/source/blender/blenkernel/intern/depsgraph.c
branches/apricot/source/blender/blenkernel/intern/effect.c
branches/apricot/source/blender/blenkernel/intern/group.c
branches/apricot/source/blender/blenkernel/intern/library.c
branches/apricot/source/blender/blenkernel/intern/multires-firstlevel.c
branches/apricot/source/blender/blenkernel/intern/multires.c
branches/apricot/source/blender/blenkernel/intern/object.c
branches/apricot/source/blender/blenkernel/intern/pointcache.c
branches/apricot/source/blender/blenloader/intern/readfile.c
branches/apricot/source/blender/blenloader/intern/writefile.c
branches/apricot/source/blender/include/butspace.h
branches/apricot/source/blender/include/particle_effect.h
branches/apricot/source/blender/makesdna/DNA_object_types.h
branches/apricot/source/blender/python/api2_2x/Effect.c
branches/apricot/source/blender/python/api2_2x/Object.c
branches/apricot/source/blender/python/api2_2x/Particle.c
branches/apricot/source/blender/python/api2_2x/doc/Effect.py
branches/apricot/source/blender/python/api2_2x/doc/Object.py
branches/apricot/source/blender/src/buttons_object.c
branches/apricot/source/blender/src/drawimasel.c
branches/apricot/source/blender/src/drawobject.c
branches/apricot/source/blender/src/editobject.c
branches/apricot/source/blender/src/header_view3d.c
branches/apricot/source/blender/src/view.c
branches/apricot/tools/btools.py
Modified: branches/apricot/SConstruct
===================================================================
--- branches/apricot/SConstruct 2008-04-27 18:29:49 UTC (rev 14568)
+++ branches/apricot/SConstruct 2008-04-27 18:45:33 UTC (rev 14569)
@@ -433,10 +433,13 @@
dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
if env['WITH_BF_ICONV']:
dllsources += ['${LCGDIR}/iconv/lib/iconv.dll']
-# if env['WITH_BF_FFMPEG']:
-# dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
-# '${LCGDIR}/ffmpeg/lib/avformat-51.dll',
-# '${LCGDIR}/ffmpeg/lib/avutil-49.dll']
+ if env['WITH_BF_FFMPEG']:
+ dllsources += ['${LCGDIR}/ffmpeg/lib/avcodec-51.dll',
+ '${LCGDIR}/ffmpeg/lib/avformat-52.dll',
+ '${LCGDIR}/ffmpeg/lib/libfaad-0.dll',
+ '${LCGDIR}/ffmpeg/lib/libmp3lame-0.dll',
+ '${LCGDIR}/ffmpeg/lib/xvidcore.dll',
+ '${LCGDIR}/ffmpeg/lib/swscale-0.dll']
windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
allinstall += windlls
Modified: branches/apricot/extern/ffmpeg/SConscript
===================================================================
--- branches/apricot/extern/ffmpeg/SConscript 2008-04-27 18:29:49 UTC (rev 14568)
+++ branches/apricot/extern/ffmpeg/SConscript 2008-04-27 18:45:33 UTC (rev 14569)
@@ -1,7 +1,11 @@
#!/usr/bin/python
+
Import('env')
+print env['BF_FFMPEG_EXTRA']
+
+
all_libs = ['libavformat', 'libavcodec', 'libswscale', 'libavutil']
root = "extern/ffmpeg"
@@ -10,8 +14,10 @@
else:
ffmpeg_switches = "--disable-shared --enable-liba52bin --enable-gpl --disable-network --disable-zlib --disable-vhook --disable-ffserver --disable-ffplay --enable-swscaler --enable-memalign-hack --enable-libx264 --enable-libxvid --enable-libmp3lame"
+#--enable-libx264
extra_variables = { }
extra_includes = [ "../x264", "../xvidcore/src", "../libmp3lame" ]
+#extra_includes = [ "../xvidcore/src" ]
import sys
import os
@@ -129,8 +135,12 @@
if env['OURPLATFORM'] in ['win32-mingw', 'win32-vc' , 'darwin'] :
defs = "HAVE_AV_CONFIG_H _ISOC9X_SOURCE"
else :
- defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
- cflags = ""
+ defs = "HAVE_AV_CONFIG_H _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _ISOC9X_SOURCE"
+
+ if env['BF_FFMPEG_EXTRA']:
+ cflags = env['BF_FFMPEG_EXTRA']
+ else :
+ cflags = ""
if "CFLAGS" in vars:
cflags += " " + vars["CFLAGS"]
Modified: branches/apricot/extern/x264/SConscript
===================================================================
--- branches/apricot/extern/x264/SConscript 2008-04-27 18:29:49 UTC (rev 14568)
+++ branches/apricot/extern/x264/SConscript 2008-04-27 18:45:33 UTC (rev 14569)
@@ -104,7 +104,11 @@
sources = list(Set(srcs.split()))
defs = ""
-cflags = ""
+
+if x264_env['BF_FFMPEG_EXTRA'] != '':
+ cflags = x264_env['BF_FFMPEG_EXTRA']
+else :
+ cflags = ""
if "CFLAGS" in vars:
cflags += " " + vars["CFLAGS"]
Modified: branches/apricot/source/blender/blenkernel/BKE_effect.h
===================================================================
--- branches/apricot/source/blender/blenkernel/BKE_effect.h 2008-04-27 18:29:49 UTC (rev 14568)
+++ branches/apricot/source/blender/blenkernel/BKE_effect.h 2008-04-27 18:45:33 UTC (rev 14569)
@@ -35,7 +35,6 @@
struct Effect;
struct ListBase;
-struct PartEff;
struct Particle;
struct Group;
@@ -51,21 +50,16 @@
Object obcopy; /* for restoring transformation data */
} pEffectorCache;
-
-struct Effect *add_effect(int type);
void free_effect(struct Effect *eff);
void free_effects(struct ListBase *lb);
struct Effect *copy_effect(struct Effect *eff);
-void copy_act_effect(struct Object *ob);
void copy_effects(struct ListBase *lbn, struct ListBase *lb);
void deselectall_eff(struct Object *ob);
-struct PartEff *give_parteff(struct Object *ob);
-void where_is_particle(struct PartEff *paf, struct Particle *pa, float ctime, float *vec);
-void build_particle_system(struct Object *ob);
/* particle deflector */
#define PE_WIND_AS_SPEED 0x00000001
+struct PartEff *give_parteff(struct Object *ob);
struct ListBase *pdInitEffectors(struct Object *obsrc, struct Group *group);
void pdEndEffectors(struct ListBase *lb);
void pdDoEffectors(struct ListBase *lb, float *opco, float *force, float *speed, float cur_time, float loc_time, unsigned int flags);
Modified: branches/apricot/source/blender/blenkernel/BKE_multires.h
===================================================================
--- branches/apricot/source/blender/blenkernel/BKE_multires.h 2008-04-27 18:29:49 UTC (rev 14568)
+++ branches/apricot/source/blender/blenkernel/BKE_multires.h 2008-04-27 18:45:33 UTC (rev 14569)
@@ -61,7 +61,7 @@
void multires_level_to_mesh(struct Object *ob, struct Mesh *me, const int render);
void multires_update_levels(struct Mesh *me, const int render);
void multires_update_first_level(struct Mesh *me, struct EditMesh *em);
-void multires_update_customdata(struct MultiresLevel *lvl1, struct CustomData *src,
+void multires_update_customdata(struct MultiresLevel *lvl1, struct EditMesh *em, struct CustomData *src,
struct CustomData *dst, const int type);
void multires_customdata_to_mesh(struct Mesh *me, struct EditMesh *em,
struct MultiresLevel *lvl, struct CustomData *src,
Modified: branches/apricot/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/apricot/source/blender/blenkernel/intern/DerivedMesh.c 2008-04-27 18:29:49 UTC (rev 14568)
+++ branches/apricot/source/blender/blenkernel/intern/DerivedMesh.c 2008-04-27 18:45:33 UTC (rev 14569)
@@ -425,7 +425,6 @@
dofluidsim = ((ob->fluidsimFlag & OB_FLUIDSIM_ENABLE) &&
(ob->fluidsimSettings->type & OB_FLUIDSIM_DOMAIN)&&
(ob->fluidsimSettings->meshSurface) &&
- (1) && (!give_parteff(ob)) && // doesnt work together with particle systems!
(me->totvert == ((Mesh *)(ob->fluidsimSettings->meshSurface))->totvert));
if (vertCos && !dofluidsim)
@@ -2086,8 +2085,7 @@
* domain objects
*/
if((G.obedit!=ob) && !needMapping) {
- if((ob->fluidsimFlag & OB_FLUIDSIM_ENABLE) &&
- (1) && (!give_parteff(ob)) ) { // doesnt work together with particle systems!
+ if((ob->fluidsimFlag & OB_FLUIDSIM_ENABLE)) {
if(ob->fluidsimSettings->type & OB_FLUIDSIM_DOMAIN) {
loadFluidsimMesh(ob,useRenderParams);
fluidsimMeshUsed = 1;
@@ -2752,14 +2750,7 @@
if (ob==G.obedit) {
editmesh_build_data(dataMask);
} else {
- PartEff *paf= give_parteff(ob);
-
mesh_build_data(ob, dataMask);
-
- if(paf) {
- if((paf->flag & PAF_STATIC) || (ob->recalc & OB_RECALC_TIME)==0)
- build_particle_system(ob);
- }
}
}
Modified: branches/apricot/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/apricot/source/blender/blenkernel/intern/action.c 2008-04-27 18:29:49 UTC (rev 14568)
+++ branches/apricot/source/blender/blenkernel/intern/action.c 2008-04-27 18:45:33 UTC (rev 14569)
@@ -961,11 +961,7 @@
/* global time */
cfra*= G.scene->r.framelen;
-
-
- /* decide later... */
-// if(no_speed_curve==0) if(ob && ob->ipo) cfra= calc_ipo_time(ob->ipo, cfra);
-
+
return cfra;
}
Modified: branches/apricot/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/apricot/source/blender/blenkernel/intern/depsgraph.c 2008-04-27 18:29:49 UTC (rev 14568)
+++ branches/apricot/source/blender/blenkernel/intern/depsgraph.c 2008-04-27 18:45:33 UTC (rev 14569)
@@ -568,36 +568,7 @@
dag_add_relation(dag,node2,node,DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Texture On Curve");
}
}
- else if(ob->type==OB_MESH) {
- PartEff *paf= give_parteff(ob);
- if(paf) {
- ListBase *listb;
- pEffectorCache *ec;
-
- /* ob location depends on itself */
- if((paf->flag & PAF_STATIC)==0)
- dag_add_relation(dag, node, node, DAG_RL_OB_DATA, "Particle-Object Relation");
-
- listb= pdInitEffectors(ob, paf->group); /* note, makes copy... */
- if(listb) {
- for(ec= listb->first; ec; ec= ec->next) {
- Object *ob1= ec->ob;
- PartDeflect *pd= ob1->pd;
-
- if(pd->forcefield) {
- node2 = dag_get_node(dag, ob1);
- if(pd->forcefield==PFIELD_GUIDE)
- dag_add_relation(dag, node2, node, DAG_RL_DATA_DATA|DAG_RL_OB_DATA, "Particle Field");
- else
- dag_add_relation(dag, node2, node, DAG_RL_OB_DATA, "Particle Field");
- }
- }
-
- pdEndEffectors(listb); /* restores copy... */
- }
- }
- }
-
+
psys= ob->particlesystem.first;
if(psys) {
ParticleEffectorCache *nec;
@@ -1987,15 +1958,6 @@
ob->shapeflag &= ~OB_SHAPE_TEMPLOCK;
}
}
- else if(ob->effect.first) {
- Effect *eff= ob->effect.first;
- PartEff *paf= give_parteff(ob);
-
- if(eff->type==EFF_WAVE)
- ob->recalc |= OB_RECALC_DATA;
- else if(paf && paf->keys==NULL)
- ob->recalc |= OB_RECALC_DATA;
- }
if((ob->fluidsimFlag & OB_FLUIDSIM_ENABLE) && (ob->fluidsimSettings)) {
// fluidsimSettings might not be initialized during load...
if(ob->fluidsimSettings->type & (OB_FLUIDSIM_DOMAIN|OB_FLUIDSIM_PARTICLE)) {
Modified: branches/apricot/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/apricot/source/blender/blenkernel/intern/effect.c 2008-04-27 18:29:49 UTC (rev 14568)
+++ branches/apricot/source/blender/blenkernel/intern/effect.c 2008-04-27 18:45:33 UTC (rev 14569)
@@ -96,43 +96,19 @@
float co[3], no[3];
} VeNoCo;
-Effect *add_effect(int type)
+/* ***************** PARTICLES ***************** */
+
+/* deprecated, only keep this for readfile.c */
+PartEff *give_parteff(Object *ob)
{
- Effect *eff=0;
PartEff *paf;
- int a;
- switch(type) {
- case EFF_PARTICLE:
- paf= MEM_callocN(sizeof(PartEff), "neweff");
- eff= (Effect *)paf;
-
- paf->sta= 1.0;
- paf->end= 100.0;
- paf->lifetime= 50.0;
- for(a=0; a<PAF_MAXMULT; a++) {
- paf->life[a]= 50.0;
- paf->child[a]= 4;
- paf->mat[a]= 1;
- }
-
- paf->totpart= 1000;
- paf->totkey= 8;
- paf->staticstep= 5;
- paf->defvec[2]= 1.0f;
- paf->nabla= 0.05f;
- paf->disp = 100;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list