Revision: 15801
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15801
Author: genscher
Date: 2008-07-27 12:46:46 +0200 (Sun, 27 Jul 2008)
Log Message:
-----------
svn merge -r 15649:15800
https://svn.blender.org/svnroot/bf-blender/trunk/blender + forgot something in
last commit --> e) Last simulated Frame will stay and not turn into cube/domain
after last valid simulated frame. f) Fixed loading of old fluidsims (1
parameter was wrong)
Modified Paths:
--------------
branches/fluidcontrol/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
branches/fluidcontrol/projectfiles_vc7/blender/src/BL_src.vcproj
branches/fluidcontrol/source/blender/blenkernel/BKE_global.h
branches/fluidcontrol/source/blender/blenkernel/BKE_idprop.h
branches/fluidcontrol/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/fluidcontrol/source/blender/blenkernel/intern/collision.c
branches/fluidcontrol/source/blender/blenkernel/intern/constraint.c
branches/fluidcontrol/source/blender/blenkernel/intern/fluidsim.c
branches/fluidcontrol/source/blender/blenkernel/intern/idprop.c
branches/fluidcontrol/source/blender/blenkernel/intern/lattice.c
branches/fluidcontrol/source/blender/blenkernel/intern/particle_system.c
branches/fluidcontrol/source/blender/blenkernel/intern/scene.c
branches/fluidcontrol/source/blender/blenkernel/intern/softbody.c
branches/fluidcontrol/source/blender/blenlib/intern/arithb.c
branches/fluidcontrol/source/blender/blenloader/intern/readfile.c
branches/fluidcontrol/source/blender/blenloader/intern/writefile.c
branches/fluidcontrol/source/blender/include/BDR_drawaction.h
branches/fluidcontrol/source/blender/include/BIF_editaction.h
branches/fluidcontrol/source/blender/include/BIF_editarmature.h
branches/fluidcontrol/source/blender/include/BIF_space.h
branches/fluidcontrol/source/blender/include/BSE_drawview.h
branches/fluidcontrol/source/blender/include/BSE_editaction_types.h
branches/fluidcontrol/source/blender/include/transform.h
branches/fluidcontrol/source/blender/makesdna/DNA_ID.h
branches/fluidcontrol/source/blender/makesdna/DNA_action_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_actuator_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_armature_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_object_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_sequence_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_space_types.h
branches/fluidcontrol/source/blender/makesdna/DNA_view3d_types.h
branches/fluidcontrol/source/blender/makesdna/intern/makesdna.c
branches/fluidcontrol/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/fluidcontrol/source/blender/nodes/intern/SHD_util.c
branches/fluidcontrol/source/blender/nodes/intern/SHD_util.h
branches/fluidcontrol/source/blender/python/BPY_interface.c
branches/fluidcontrol/source/blender/python/api2_2x/Armature.c
branches/fluidcontrol/source/blender/python/api2_2x/Blender.c
branches/fluidcontrol/source/blender/python/api2_2x/Bone.c
branches/fluidcontrol/source/blender/python/api2_2x/IDProp.c
branches/fluidcontrol/source/blender/python/api2_2x/Particle.c
branches/fluidcontrol/source/blender/python/api2_2x/doc/Armature.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/IDProp.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Ipo.py
branches/fluidcontrol/source/blender/python/api2_2x/doc/Particle.py
branches/fluidcontrol/source/blender/python/api2_2x/sceneRender.c
branches/fluidcontrol/source/blender/render/intern/source/shadeoutput.c
branches/fluidcontrol/source/blender/src/buttons_editing.c
branches/fluidcontrol/source/blender/src/buttons_logic.c
branches/fluidcontrol/source/blender/src/drawaction.c
branches/fluidcontrol/source/blender/src/drawnode.c
branches/fluidcontrol/source/blender/src/drawobject.c
branches/fluidcontrol/source/blender/src/drawseq.c
branches/fluidcontrol/source/blender/src/drawview.c
branches/fluidcontrol/source/blender/src/editaction.c
branches/fluidcontrol/source/blender/src/editarmature.c
branches/fluidcontrol/source/blender/src/editnode.c
branches/fluidcontrol/source/blender/src/editobject.c
branches/fluidcontrol/source/blender/src/editseq.c
branches/fluidcontrol/source/blender/src/header_action.c
branches/fluidcontrol/source/blender/src/header_node.c
branches/fluidcontrol/source/blender/src/header_seq.c
branches/fluidcontrol/source/blender/src/header_view3d.c
branches/fluidcontrol/source/blender/src/interface.c
branches/fluidcontrol/source/blender/src/interface_draw.c
branches/fluidcontrol/source/blender/src/outliner.c
branches/fluidcontrol/source/blender/src/poseobject.c
branches/fluidcontrol/source/blender/src/sequence.c
branches/fluidcontrol/source/blender/src/space.c
branches/fluidcontrol/source/blender/src/transform_conversions.c
branches/fluidcontrol/source/blender/src/transform_generics.c
branches/fluidcontrol/source/blender/src/transform_manipulator.c
branches/fluidcontrol/source/blender/src/usiblender.c
branches/fluidcontrol/source/creator/creator.c
branches/fluidcontrol/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/fluidcontrol/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/fluidcontrol/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/fluidcontrol/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/fluidcontrol/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_IpoConvert.cpp
branches/fluidcontrol/source/gameengine/Converter/KX_IpoConvert.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_ISensor.h
branches/fluidcontrol/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/fluidcontrol/source/gameengine/GameLogic/SCA_LogicManager.h
branches/fluidcontrol/source/gameengine/GamePlayer/common/GPC_Canvas.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_BulletPhysicsController.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_GameObject.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_IPhysicsController.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_IpoActuator.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_MaterialIpoController.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_OdePhysicsController.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_OdePhysicsController.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_PyMath.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_Scene.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
branches/fluidcontrol/source/gameengine/Ketsji/KX_SumoPhysicsController.h
branches/fluidcontrol/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/fluidcontrol/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/fluidcontrol/source/gameengine/PyDoc/KX_ConstraintActuator.py
branches/fluidcontrol/source/gameengine/PyDoc/KX_GameObject.py
branches/fluidcontrol/source/gameengine/PyDoc/KX_IpoActuator.py
branches/fluidcontrol/source/gameengine/PyDoc/KX_ObjectActuator.py
branches/fluidcontrol/source/gameengine/PyDoc/SCA_ISensor.py
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/fluidcontrol/source/gameengine/Rasterizer/RAS_MeshObject.h
Added Paths:
-----------
branches/fluidcontrol/source/blender/include/BDR_gpencil.h
branches/fluidcontrol/source/blender/include/BIF_drawgpencil.h
branches/fluidcontrol/source/blender/makesdna/DNA_gpencil_types.h
branches/fluidcontrol/source/blender/src/drawgpencil.c
branches/fluidcontrol/source/blender/src/editaction_gpencil.c
branches/fluidcontrol/source/blender/src/gpencil.c
branches/fluidcontrol/source/gameengine/PyDoc/BL_ShapeActionActuator.py
branches/fluidcontrol/source/gameengine/PyDoc/KX_ActuatorSensor.py
branches/fluidcontrol/source/gameengine/PyDoc/KX_StateActuator.py
Modified:
branches/fluidcontrol/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
===================================================================
--- branches/fluidcontrol/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/projectfiles_vc7/blender/makesdna/DNA_makesdna.vcproj
2008-07-27 10:46:46 UTC (rev 15801)
@@ -472,6 +472,9 @@
RelativePath="..\..\..\source\blender\makesdna\DNA_fileglobal_types.h">
</File>
<File
+
RelativePath="..\..\..\source\blender\makesdna\DNA_gpencil_types.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\makesdna\DNA_group_types.h">
</File>
<File
Modified: branches/fluidcontrol/projectfiles_vc7/blender/src/BL_src.vcproj
===================================================================
--- branches/fluidcontrol/projectfiles_vc7/blender/src/BL_src.vcproj
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/projectfiles_vc7/blender/src/BL_src.vcproj
2008-07-27 10:46:46 UTC (rev 15801)
@@ -182,6 +182,9 @@
RelativePath="..\..\..\source\blender\src\drawdeps.c">
</File>
<File
+
RelativePath="..\..\..\source\blender\src\drawgpencil.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\drawimage.c">
</File>
<File
@@ -233,6 +236,9 @@
RelativePath="..\..\..\source\blender\src\editaction.c">
</File>
<File
+
RelativePath="..\..\..\source\blender\src\editaction_gpencil.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\editarmature.c">
</File>
<File
@@ -350,6 +356,9 @@
RelativePath="..\..\..\source\blender\src\glutil.c">
</File>
<File
+
RelativePath="..\..\..\source\blender\src\gpencil.c">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\src\hddaudio.c">
</File>
<File
@@ -618,6 +627,9 @@
RelativePath="..\..\..\source\blender\include\BDR_editobject.h">
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BDR_gpencil.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BDR_imagepaint.h">
</File>
<File
@@ -636,6 +648,9 @@
RelativePath="..\..\..\source\blender\include\BIF_cursors.h">
</File>
<File
+
RelativePath="..\..\..\source\blender\include\BIF_drawgpencil.h">
+ </File>
+ <File
RelativePath="..\..\..\source\blender\include\BIF_drawimage.h">
</File>
<File
Modified: branches/fluidcontrol/source/blender/blenkernel/BKE_global.h
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/BKE_global.h
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/BKE_global.h
2008-07-27 10:46:46 UTC (rev 15801)
@@ -175,6 +175,7 @@
#define G_WEIGHTPAINT (1 << 15)
#define G_TEXTUREPAINT (1 << 16)
/* #define G_NOFROZEN (1 << 17) also removed */
+#define G_GREASEPENCIL (1 << 17)
#define G_DRAWEDGES (1 << 18)
#define G_DRAWCREASES (1 << 19)
#define G_DRAWSEAMS (1 << 20)
@@ -265,3 +266,4 @@
#endif
+
Modified: branches/fluidcontrol/source/blender/blenkernel/BKE_idprop.h
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/BKE_idprop.h
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/BKE_idprop.h
2008-07-27 10:46:46 UTC (rev 15801)
@@ -46,6 +46,7 @@
typedef union {
int i;
float f;
+ double d;
char *str;
struct ID *id;
struct {
Modified:
branches/fluidcontrol/source/blender/blenkernel/bad_level_call_stubs/stubs.c
===================================================================
---
branches/fluidcontrol/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2008-07-27 10:38:30 UTC (rev 15800)
+++
branches/fluidcontrol/source/blender/blenkernel/bad_level_call_stubs/stubs.c
2008-07-27 10:46:46 UTC (rev 15801)
@@ -1,4 +1,3 @@
-
/**
* $Id$
*
@@ -355,7 +354,8 @@
/* editseq.c */
Sequence *get_forground_frame_seq(int frame){return 0;};
-void set_last_seq(Sequence *seq){};
+void clear_last_seq(Sequence *seq){};
+
/* modifier.c stub */
void harmonic_coordinates_bind(struct MeshDeformModifierData *mmd,
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/collision.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/collision.c
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/collision.c
2008-07-27 10:46:46 UTC (rev 15801)
@@ -1437,6 +1437,9 @@
if(coll_ob == self)
continue;
+
+ if( !collmd->bvhtree)
+ continue;
if(numobj >= maxobj)
{
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/constraint.c
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/constraint.c
2008-07-27 10:46:46 UTC (rev 15801)
@@ -558,8 +558,8 @@
if (dgroup < 0) return;
/* get DerivedMesh */
- if (G.obedit && G.editMesh) {
- /* we are in editmode, so get a special derived mesh */
+ if ((G.obedit == ob) && (G.editMesh)) {
+ /* target is in editmode, so get a special derived mesh */
dm = CDDM_from_editmesh(G.editMesh, ob->data);
}
else {
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/fluidsim.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/fluidsim.c
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/fluidsim.c
2008-07-27 10:46:46 UTC (rev 15801)
@@ -193,6 +193,9 @@
{
return result;
}
+
+ // it was supposed to be a valid frame but it isn't!
+ fss->lastgoodframe = -1;
}
result = CDDM_copy(dm);
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/idprop.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/idprop.c
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/idprop.c
2008-07-27 10:46:46 UTC (rev 15801)
@@ -54,7 +54,8 @@
sizeof(float)*16, /*Matrix type, deprecated*/
0, /*arrays don't have a fixed size*/
sizeof(ListBase), /*Group type*/
- sizeof(void*)
+ sizeof(void*),
+ sizeof(double)
};
@@ -365,10 +366,14 @@
prop = MEM_callocN(sizeof(IDProperty), "IDProperty
float");
*(float*)&prop->data.val = val.f;
break;
+ case IDP_DOUBLE:
+ prop = MEM_callocN(sizeof(IDProperty), "IDProperty
float");
+ *(double*)&prop->data.val = val.d;
+ break;
case IDP_ARRAY:
{
- /*for now, we only support float and int arrays*/
- if (val.array.type == IDP_FLOAT || val.array.type ==
IDP_INT) {
+ /*for now, we only support float and int and double
arrays*/
+ if (val.array.type == IDP_FLOAT || val.array.type ==
IDP_INT || val.array.type == IDP_DOUBLE) {
prop = MEM_callocN(sizeof(IDProperty),
"IDProperty array");
prop->len = prop->totallen = val.array.len;
prop->subtype = val.array.type;
@@ -411,6 +416,10 @@
prop->type = type;
strncpy(prop->name, name, MAX_IDPROP_NAME);
+
+ /*security null byte*/
+ prop->name[MAX_IDPROP_NAME-1] = 0;
+
return prop;
}
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/lattice.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/lattice.c
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/lattice.c
2008-07-27 10:46:46 UTC (rev 15801)
@@ -915,7 +915,10 @@
mti->deformVerts(md, ob, NULL, vertexCos, numVerts);
}
- if (vertexCos) {
+ /* always displist to make this work like derivedmesh */
+ if (!vertexCos) vertexCos = lattice_getVertexCos(ob, &numVerts);
+
+ {
DispList *dl = MEM_callocN(sizeof(*dl), "lt_dl");
dl->type = DL_VERTS;
dl->parts = 1;
Modified:
branches/fluidcontrol/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/particle_system.c
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/particle_system.c
2008-07-27 10:46:46 UTC (rev 15801)
@@ -2797,7 +2797,10 @@
epart= epsys->part;
pd= epart->pd;
totepart= epsys->totpart;
-
+
+ if(totepart <= 0)
+ continue;
+
if(pd->forcefield==PFIELD_HARMONIC){
/* every particle is mapped to only one
harmonic effector particle */
p= pa_no%epsys->totpart;
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/scene.c
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/scene.c
2008-07-27 10:46:46 UTC (rev 15801)
@@ -303,7 +303,7 @@
int flag;
// Note: this here is defined in editseq.c (BIF_editseq.h), NOT in
blenkernel!
- set_last_seq(NULL);
+ clear_last_seq();
G.scene= sce;
Modified: branches/fluidcontrol/source/blender/blenkernel/intern/softbody.c
===================================================================
--- branches/fluidcontrol/source/blender/blenkernel/intern/softbody.c
2008-07-27 10:38:30 UTC (rev 15800)
+++ branches/fluidcontrol/source/blender/blenkernel/intern/softbody.c
2008-07-27 10:46:46 UTC (rev 15801)
@@ -2053,7 +2053,6 @@
/* check conditions for various options */
do_deflector= query_external_colliders(ob);
- do_effector= pdInitEffectors(ob,NULL);
do_selfcollision=((ob->softflag & OB_SB_EDGES) && (sb->bspring)&&
(ob->softflag & OB_SB_SELF));
do_springcollision=do_deflector && (ob->softflag & OB_SB_EDGES)
&&(ob->softflag & OB_SB_EDGECOLL);
do_aero=((sb->aeroedge)&& (ob->softflag & OB_SB_EDGES));
@@ -2061,9 +2060,10 @@
iks = 1.0f/(1.0f-sb->inspring)-1.0f ;/* inner spring constants
function */
bproot= sb->bpoint; /* need this for proper spring addressing */
+ if (do_springcollision || do_aero)
scan_for_ext_spring_forces(ob,timenow);
+ /* after spring scan because it uses Effoctors too */
+ do_effector= pdInitEffectors(ob,NULL);
-
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
