[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12938] branches/cloth/blender: svn merge -r 12856:12937 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Daniel Genrich
daniel.genrich at gmx.net
Tue Dec 18 18:29:35 CET 2007
Revision: 12938
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12938
Author: genscher
Date: 2007-12-18 18:29:35 +0100 (Tue, 18 Dec 2007)
Log Message:
-----------
svn merge -r 12856:12937 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Modified Paths:
--------------
branches/cloth/blender/intern/bmfont/intern/BMF_BitmapFont.cpp
branches/cloth/blender/intern/elbeem/intern/isosurface.cpp
branches/cloth/blender/intern/elbeem/intern/solver_adap.cpp
branches/cloth/blender/intern/elbeem/intern/solver_main.cpp
branches/cloth/blender/source/blender/blenkernel/BKE_bad_level_calls.h
branches/cloth/blender/source/blender/blenkernel/BKE_modifier.h
branches/cloth/blender/source/blender/blenkernel/BKE_particle.h
branches/cloth/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/cloth/blender/source/blender/blenkernel/intern/anim.c
branches/cloth/blender/source/blender/blenkernel/intern/curve.c
branches/cloth/blender/source/blender/blenkernel/intern/depsgraph.c
branches/cloth/blender/source/blender/blenkernel/intern/modifier.c
branches/cloth/blender/source/blender/blenkernel/intern/object.c
branches/cloth/blender/source/blender/blenkernel/intern/particle.c
branches/cloth/blender/source/blender/blenkernel/intern/particle_system.c
branches/cloth/blender/source/blender/blenlib/BLI_blenlib.h
branches/cloth/blender/source/blender/blenlib/intern/util.c
branches/cloth/blender/source/blender/blenloader/intern/readfile.c
branches/cloth/blender/source/blender/include/BIF_editarmature.h
branches/cloth/blender/source/blender/include/BIF_gl.h
branches/cloth/blender/source/blender/include/transform.h
branches/cloth/blender/source/blender/makesdna/DNA_constraint_types.h
branches/cloth/blender/source/blender/makesdna/DNA_listBase.h
branches/cloth/blender/source/blender/makesdna/DNA_object_types.h
branches/cloth/blender/source/blender/makesdna/DNA_particle_types.h
branches/cloth/blender/source/blender/makesdna/DNA_scene_types.h
branches/cloth/blender/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/cloth/blender/source/blender/python/api2_2x/Draw.c
branches/cloth/blender/source/blender/python/api2_2x/Geometry.c
branches/cloth/blender/source/blender/python/api2_2x/Key.c
branches/cloth/blender/source/blender/python/api2_2x/Mesh.c
branches/cloth/blender/source/blender/python/api2_2x/sceneSequence.c
branches/cloth/blender/source/blender/radiosity/intern/source/radfactors.c
branches/cloth/blender/source/blender/radiosity/intern/source/radrender.c
branches/cloth/blender/source/blender/render/extern/include/RE_raytrace.h
branches/cloth/blender/source/blender/render/extern/include/RE_shader_ext.h
branches/cloth/blender/source/blender/render/intern/include/render_types.h
branches/cloth/blender/source/blender/render/intern/include/rendercore.h
branches/cloth/blender/source/blender/render/intern/include/renderdatabase.h
branches/cloth/blender/source/blender/render/intern/include/shadbuf.h
branches/cloth/blender/source/blender/render/intern/include/shading.h
branches/cloth/blender/source/blender/render/intern/include/strand.h
branches/cloth/blender/source/blender/render/intern/include/zbuf.h
branches/cloth/blender/source/blender/render/intern/source/convertblender.c
branches/cloth/blender/source/blender/render/intern/source/envmap.c
branches/cloth/blender/source/blender/render/intern/source/imagetexture.c
branches/cloth/blender/source/blender/render/intern/source/pipeline.c
branches/cloth/blender/source/blender/render/intern/source/rayshade.c
branches/cloth/blender/source/blender/render/intern/source/raytrace.c
branches/cloth/blender/source/blender/render/intern/source/rendercore.c
branches/cloth/blender/source/blender/render/intern/source/renderdatabase.c
branches/cloth/blender/source/blender/render/intern/source/shadbuf.c
branches/cloth/blender/source/blender/render/intern/source/shadeinput.c
branches/cloth/blender/source/blender/render/intern/source/shadeoutput.c
branches/cloth/blender/source/blender/render/intern/source/strand.c
branches/cloth/blender/source/blender/render/intern/source/texture.c
branches/cloth/blender/source/blender/render/intern/source/zbuf.c
branches/cloth/blender/source/blender/src/buttons_editing.c
branches/cloth/blender/source/blender/src/buttons_object.c
branches/cloth/blender/source/blender/src/drawobject.c
branches/cloth/blender/source/blender/src/drawtext.c
branches/cloth/blender/source/blender/src/editarmature.c
branches/cloth/blender/source/blender/src/editobject.c
branches/cloth/blender/source/blender/src/editparticle.c
branches/cloth/blender/source/blender/src/header_view3d.c
branches/cloth/blender/source/blender/src/language.c
branches/cloth/blender/source/blender/src/meshlaplacian.c
branches/cloth/blender/source/blender/src/poseobject.c
branches/cloth/blender/source/blender/src/sculptmode.c
branches/cloth/blender/source/blender/src/space.c
branches/cloth/blender/source/blender/src/transform.c
branches/cloth/blender/source/blender/src/transform_conversions.c
branches/cloth/blender/source/blender/src/transform_snap.c
branches/cloth/blender/source/blender/yafray/YafRay_Api.h
branches/cloth/blender/source/blender/yafray/intern/api.cpp
branches/cloth/blender/source/blender/yafray/intern/export_File.cpp
branches/cloth/blender/source/blender/yafray/intern/export_Plugin.cpp
branches/cloth/blender/source/blender/yafray/intern/yafray_Render.cpp
branches/cloth/blender/source/blender/yafray/intern/yafray_Render.h
branches/cloth/blender/source/nan_compile.mk
branches/cloth/blender/source/nan_definitions.mk
branches/cloth/blender/source/nan_link.mk
branches/cloth/blender/source/tools/guess/guessconfig
branches/cloth/blender/tools/btools.py
Property Changed:
----------------
branches/cloth/blender/source/blender/python/api2_2x/doc/pupblock.blend
branches/cloth/blender/source/tools/guess/config.guess
branches/cloth/blender/source/tools/guess/guessconfig
Modified: branches/cloth/blender/intern/bmfont/intern/BMF_BitmapFont.cpp
===================================================================
--- branches/cloth/blender/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/intern/bmfont/intern/BMF_BitmapFont.cpp 2007-12-18 17:29:35 UTC (rev 12938)
@@ -291,20 +291,20 @@
if (fbuf) {
float *pixel, *max;
unsigned char c;
- int x, y;
+ int xi, yi;
max = fbuf + (4 * (w * h));
while ((c = (unsigned char) *str++)) {
BMF_CharData & cd = m_fontData->chars[c];
if (cd.data_offset != -1) {
- for (y = 0; y < cd.height; y++) {
- unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*y];
- for (x = cd.xorig; x < cd.width; x++) {
- pixel = fbuf + 4 * (((posy + y - cd.yorig) * w) + (posx + x));
+ for (yi = 0; yi < cd.height; yi++) {
+ unsigned char* chrRow = &m_fontData->bitmap_data[cd.data_offset + ((cd.width+7)/8)*yi];
+ for (xi = cd.xorig; xi < cd.width; xi++) {
+ pixel = fbuf + 4 * (((posy + yi - cd.yorig) * w) + (posx + xi));
if ((pixel < max) && (pixel > fbuf)) {
- int byteIdx = x/8;
- int bitIdx = 7 - (x%8);
+ int byteIdx = xi/8;
+ int bitIdx = 7 - (xi%8);
if (chrRow[byteIdx]&(1<<bitIdx)) {
pixel[0] = col[0];
Modified: branches/cloth/blender/intern/elbeem/intern/isosurface.cpp
===================================================================
--- branches/cloth/blender/intern/elbeem/intern/isosurface.cpp 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/intern/elbeem/intern/isosurface.cpp 2007-12-18 17:29:35 UTC (rev 12938)
@@ -13,11 +13,10 @@
#include <algorithm>
#include <stdio.h>
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
-
// just use default rounding for platforms where its not available
#ifndef round
#define round(x) (x)
Modified: branches/cloth/blender/intern/elbeem/intern/solver_adap.cpp
===================================================================
--- branches/cloth/blender/intern/elbeem/intern/solver_adap.cpp 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/intern/elbeem/intern/solver_adap.cpp 2007-12-18 17:29:35 UTC (rev 12938)
@@ -11,11 +11,10 @@
#include "solver_relax.h"
#include "particletracer.h"
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
-
/*****************************************************************************/
//! coarse step functions
/*****************************************************************************/
Modified: branches/cloth/blender/intern/elbeem/intern/solver_main.cpp
===================================================================
--- branches/cloth/blender/intern/elbeem/intern/solver_main.cpp 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/intern/elbeem/intern/solver_main.cpp 2007-12-18 17:29:35 UTC (rev 12938)
@@ -13,7 +13,7 @@
#include "loop_tools.h"
#include <stdlib.h>
-#if !defined(linux) && (defined (__sparc) || defined (__sparc__))
+#if (defined (__sun__) || defined (__sun)) || (!defined(linux) && (defined (__sparc) || defined (__sparc__)))
#include <ieeefp.h>
#endif
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_bad_level_calls.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_bad_level_calls.h 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_bad_level_calls.h 2007-12-18 17:29:35 UTC (rev 12938)
@@ -91,8 +91,9 @@
void mainqenter (unsigned short event, short val);
void waitcursor(int);
void allqueue(unsigned short event, short val);
-#define REDRAWVIEW3D 0x4010
-#define REDRAWBUTSEDIT 0x4019
+#define REDRAWVIEW3D 0x4010
+#define REDRAWBUTSOBJECT 0x4018
+#define REDRAWBUTSEDIT 0x4019
struct Material;
extern struct Material defmaterial;
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_modifier.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_modifier.h 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_modifier.h 2007-12-18 17:29:35 UTC (rev 12938)
@@ -294,6 +294,7 @@
struct Object *modifiers_isDeformedByLattice(struct Object *ob);
int modifiers_usesArmature(struct Object *ob, struct bArmature *arm);
int modifiers_isDeformed(struct Object *ob);
+void modifier_freeTemporaryData(struct ModifierData *md);
int modifiers_indexInObject(struct Object *ob, struct ModifierData *md);
Modified: branches/cloth/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/BKE_particle.h 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/source/blender/blenkernel/BKE_particle.h 2007-12-18 17:29:35 UTC (rev 12938)
@@ -169,6 +169,8 @@
int from, cfrom, distr;
+ struct ParticleData *tpars;
+
/* path caching */
int editupdate, between, steps;
int totchild, totparent;
@@ -203,15 +205,18 @@
void psys_enable_all(struct Object *ob);
int psys_ob_has_hair(struct Object *ob);
int psys_in_edit_mode(struct ParticleSystem *psys);
+int psys_check_enabled(struct Object *ob, struct ParticleSystem *psys);
void psys_free_settings(struct ParticleSettings *part);
void free_child_path_cache(struct ParticleSystem *psys);
void psys_free_path_cache(struct ParticleSystem *psys);
-void psys_free_render_memory(struct Object *ob, struct ParticleSystem *psys);
void free_hair(struct ParticleSystem *psys);
void free_keyed_keys(struct ParticleSystem *psys);
void psys_free(struct Object * ob, struct ParticleSystem * psys);
+void psys_particles_to_render_backup(struct Object *ob, struct ParticleSystem *psys);
+void psys_render_backup_to_particles(struct Object *ob, struct ParticleSystem *psys);
+
void clear_particles_from_cache(struct Object *ob, struct ParticleSystem *psys, int cfra);
//void psys_remove_from_particle_list(struct Object *ob, short nbr, struct ParticleSystem *psys);
@@ -280,6 +285,7 @@
void initialize_particle(struct ParticleData *pa, int p, struct Object *ob, struct ParticleSystem *psys, struct ParticleSystemModifierData *psmd);
void reset_particle(struct ParticleData *pa, struct ParticleSystem *psys, struct ParticleSystemModifierData *psmd, struct Object *ob, float dtime, float cfra, float *vg_vel, float *vg_tan, float *vg_rot);
+void psys_calc_dmfaces(struct Object *ob, struct DerivedMesh *dm, struct ParticleSystem *psys);
int psys_particle_dm_face_lookup(struct Object *ob, struct DerivedMesh *dm, int index, float *fw, struct LinkNode *node);
/* ParticleEffectorCache->type */
Modified: branches/cloth/blender/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/DerivedMesh.c 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/source/blender/blenkernel/intern/DerivedMesh.c 2007-12-18 17:29:35 UTC (rev 12938)
@@ -1877,7 +1877,7 @@
int needMapping, CustomDataMask dataMask)
{
Mesh *me = ob->data;
- ModifierData *md = modifiers_getVirtualModifierList(ob);
+ ModifierData *firstmd, *md;
LinkNode *datamasks, *curr;
CustomDataMask mask;
float (*deformedVerts)[3] = NULL;
@@ -1886,6 +1886,8 @@
int fluidsimMeshUsed = 0;
int required_mode;
+ md = firstmd = modifiers_getVirtualModifierList(ob);
+
modifiers_clearErrors(ob);
/* we always want to keep original indices */
@@ -2097,6 +2099,9 @@
}
}
+ for(md=firstmd; md; md=md->next)
+ modifier_freeTemporaryData(md);
+
/* Yay, we are done. If we have a DerivedMesh and deformed vertices
* need to apply these back onto the DerivedMesh. If we have no
* DerivedMesh then we need to build one.
Modified: branches/cloth/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/anim.c 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/source/blender/blenkernel/intern/anim.c 2007-12-18 17:29:35 UTC (rev 12938)
@@ -292,14 +292,6 @@
dob->index= index;
ob->lay= lay;
- /* allowing duplicators for particle systems... a bit silly still */
- {
- PartEff *paf= give_parteff(ob);
- if(paf) {
- Mat4Invert(ob->imat, ob->obmat);
- Mat4CpyMat4(paf->imat, ob->imat);
- }
- }
return dob;
}
@@ -809,7 +801,7 @@
group_duplilist(duplilist, ob, 0); /* now recursive */
- /* make copy already, because in group dupli's deform displists can be makde, requiring parent matrices */
+ /* make copy already, because in group dupli's deform displists can be made, requiring parent matrices */
for(dob= duplilist->first; dob; dob= dob->next)
Mat4CpyMat4(dob->ob->obmat, dob->mat);
}
Modified: branches/cloth/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/cloth/blender/source/blender/blenkernel/intern/curve.c 2007-12-18 16:55:09 UTC (rev 12937)
+++ branches/cloth/blender/source/blender/blenkernel/intern/curve.c 2007-12-18 17:29:35 UTC (rev 12938)
@@ -1480,7 +1480,7 @@
while(nu) {
if(nu->pntsu<=1) {
- bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelList");
+ bl= MEM_callocN(sizeof(BevList)+1*sizeof(BevPoint), "makeBevelList");
BLI_addtail(&(cu->bev), bl);
bl->nr= 0;
} else {
@@ -1490,8 +1490,7 @@
resolu= nu->resolu;
if((nu->type & 7)==CU_POLY) {
-
- len= nu->pntsu;
+
bl= MEM_callocN(sizeof(BevList)+len*sizeof(BevPoint), "makeBevelList");
BLI_addtail(&(cu->bev), bl);
@@ -1544,7 +1543,7 @@
bevp->z= prevbezt->vec[1][2];
bevp->alfa= prevbezt->alfa;
bevp->f1= SELECT;
- bevp->f2= SELECT;
+ bevp->f2= 0;
bevp++;
bl->nr++;
bl->flag= 1;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list