[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22878] branches/ge_dyn_load/source: merge https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/ blender -r22823:22876

Campbell Barton ideasman42 at gmail.com
Sun Aug 30 02:18:52 CEST 2009


Revision: 22878
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22878
Author:   campbellbarton
Date:     2009-08-30 02:18:51 +0200 (Sun, 30 Aug 2009)

Log Message:
-----------
merge https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender -r22823:22876

Modified Paths:
--------------
    branches/ge_dyn_load/source/Makefile
    branches/ge_dyn_load/source/blender/blenkernel/BKE_paint.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_particle.h
    branches/ge_dyn_load/source/blender/blenkernel/BKE_pointcache.h
    branches/ge_dyn_load/source/blender/blenkernel/intern/DerivedMesh.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/cloth.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/object.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/particle.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/particle_system.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/pointcache.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/scene.c
    branches/ge_dyn_load/source/blender/blenkernel/intern/sound.c
    branches/ge_dyn_load/source/blender/blenloader/intern/readfile.c
    branches/ge_dyn_load/source/blender/blenloader/intern/writefile.c
    branches/ge_dyn_load/source/blender/editors/Makefile
    branches/ge_dyn_load/source/blender/editors/SConscript
    branches/ge_dyn_load/source/blender/editors/animation/anim_filter.c
    branches/ge_dyn_load/source/blender/editors/gpencil/drawgpencil.c
    branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_edit.c
    branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_intern.h
    branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_ops.c
    branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_paint.c
    branches/ge_dyn_load/source/blender/editors/include/ED_gpencil.h
    branches/ge_dyn_load/source/blender/editors/include/ED_particle.h
    branches/ge_dyn_load/source/blender/editors/mesh/editmesh.c
    branches/ge_dyn_load/source/blender/editors/object/object_edit.c
    branches/ge_dyn_load/source/blender/editors/physics/ed_pointcache.c
    branches/ge_dyn_load/source/blender/editors/physics/editparticle.c
    branches/ge_dyn_load/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/ge_dyn_load/source/blender/editors/sculpt_paint/sculpt.c
    branches/ge_dyn_load/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/ge_dyn_load/source/blender/editors/space_api/spacetypes.c
    branches/ge_dyn_load/source/blender/editors/space_image/image_ops.c
    branches/ge_dyn_load/source/blender/editors/space_logic/logic_window.c
    branches/ge_dyn_load/source/blender/editors/space_outliner/outliner.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/drawobject.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_buttons.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_header.c
    branches/ge_dyn_load/source/blender/editors/space_view3d/view3d_ops.c
    branches/ge_dyn_load/source/blender/editors/transform/transform_conversions.c
    branches/ge_dyn_load/source/blender/editors/transform/transform_manipulator.c
    branches/ge_dyn_load/source/blender/makesdna/DNA_object_force.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_object_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_particle_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_scene_types.h
    branches/ge_dyn_load/source/blender/makesdna/DNA_userdef_types.h
    branches/ge_dyn_load/source/blender/makesrna/RNA_enum_types.h
    branches/ge_dyn_load/source/blender/makesrna/RNA_types.h
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_curve.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_gpencil.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_material.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_mesh.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_object.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_packedfile.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_particle.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_scene.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_space.c
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_userdef.c
    branches/ge_dyn_load/source/blender/python/intern/bpy_interface.c
    branches/ge_dyn_load/source/blender/render/intern/source/rayshade.c
    branches/ge_dyn_load/source/blender/render/intern/source/rendercore.c
    branches/ge_dyn_load/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/ge_dyn_load/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/ge_dyn_load/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/ge_dyn_load/source/gameengine/PyDoc/GameLogic.py

Added Paths:
-----------
    branches/ge_dyn_load/source/blender/editors/gpencil/gpencil_buttons.c
    branches/ge_dyn_load/source/blender/editors/include/ED_sound.h
    branches/ge_dyn_load/source/blender/editors/sound/
    branches/ge_dyn_load/source/blender/editors/sound/Makefile
    branches/ge_dyn_load/source/blender/editors/sound/SConscript
    branches/ge_dyn_load/source/blender/editors/sound/sound_intern.h
    branches/ge_dyn_load/source/blender/editors/sound/sound_ops.c

Removed Paths:
-------------
    branches/ge_dyn_load/source/blender/blenkernel/BKE_sculpt.h
    branches/ge_dyn_load/source/blender/editors/sound/Makefile
    branches/ge_dyn_load/source/blender/editors/sound/SConscript
    branches/ge_dyn_load/source/blender/editors/sound/sound_intern.h
    branches/ge_dyn_load/source/blender/editors/sound/sound_ops.c

Property Changed:
----------------
    branches/ge_dyn_load/source/blender/makesrna/intern/rna_gpencil.c

Modified: branches/ge_dyn_load/source/Makefile
===================================================================
--- branches/ge_dyn_load/source/Makefile	2009-08-29 23:55:35 UTC (rev 22877)
+++ branches/ge_dyn_load/source/Makefile	2009-08-30 00:18:51 UTC (rev 22878)
@@ -266,6 +266,7 @@
 PULIB += $(OCGDIR)/blender/ed_console/$(DEBUG_DIR)libed_console.a
 PULIB += $(OCGDIR)/blender/ed_userpref/$(DEBUG_DIR)libed_userpref.a
 PULIB += $(OCGDIR)/blender/ed_gpencil/$(DEBUG_DIR)libed_gpencil.a
+PULIB += $(OCGDIR)/blender/ed_opsound/$(DEBUG_DIR)libed_opsound.a
 PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
 PULIB += $(OCGDIR)/blender/python/$(DEBUG_DIR)libpython.a
 PULIB += $(OCGDIR)/blender/makesrna/$(DEBUG_DIR)librna.a

Modified: branches/ge_dyn_load/source/blender/blenkernel/BKE_paint.h
===================================================================
--- branches/ge_dyn_load/source/blender/blenkernel/BKE_paint.h	2009-08-29 23:55:35 UTC (rev 22877)
+++ branches/ge_dyn_load/source/blender/blenkernel/BKE_paint.h	2009-08-30 00:18:51 UTC (rev 22878)
@@ -29,9 +29,13 @@
 #define BKE_PAINT_H
 
 struct Brush;
+struct MFace;
+struct MultireModifierData;
+struct MVert;
 struct Object;
 struct Paint;
 struct Scene;
+struct StrokeCache;
 
 extern const char PAINT_CURSOR_SCULPT[3];
 extern const char PAINT_CURSOR_VERTEX_PAINT[3];
@@ -53,4 +57,39 @@
  * however hiding faces is useful */
 int paint_facesel_test(struct Object *ob);
 
+/* Session data (mode-specific) */
+
+typedef struct SculptSession {
+	struct ProjVert *projverts;
+
+	/* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */
+	struct MultiresModifierData *multires; /* Special handling for multires meshes */
+	struct MVert *mvert;
+	struct MFace *mface;
+	int totvert, totface;
+	float *face_normals;
+	
+	/* Mesh connectivity */
+	struct ListBase *fmap;
+	struct IndexNode *fmap_mem;
+	int fmap_size;
+
+	/* Used temporarily per-stroke */
+	float *vertexcosnos;
+	ListBase damaged_rects;
+	ListBase damaged_verts;
+	
+	/* Used to cache the render of the active texture */
+	unsigned int texcache_side, *texcache, texcache_actual;
+
+	/* Layer brush persistence between strokes */
+ 	float (*mesh_co_orig)[3]; /* Copy of the mesh vertices' locations */
+	float *layer_disps; /* Displacements for each vertex */
+
+	struct SculptStroke *stroke;
+	struct StrokeCache *cache;
+} SculptSession;
+
+void free_sculptsession(SculptSession **);
+
 #endif

Modified: branches/ge_dyn_load/source/blender/blenkernel/BKE_particle.h
===================================================================
--- branches/ge_dyn_load/source/blender/blenkernel/BKE_particle.h	2009-08-29 23:55:35 UTC (rev 22877)
+++ branches/ge_dyn_load/source/blender/blenkernel/BKE_particle.h	2009-08-30 00:18:51 UTC (rev 22878)
@@ -109,46 +109,10 @@
 	float vel[3];
 	float rot[4];
 	float col[3];
+	float time;
 	int steps;
 } ParticleCacheKey;
 
-typedef struct ParticleEditKey{
-	float *co;
-	float *vel;
-	float *rot;
-	float *time;
-
-	float world_co[3];
-	float length;
-	short flag;
-} ParticleEditKey;
-
-typedef struct ParticleUndo {
-	struct ParticleUndo *next, *prev;
-	struct ParticleEditKey **keys;
-	struct KDTree *emitter_field;
-	struct ParticleData *particles;
-	float *emitter_cosnos;
-	int totpart, totkeys;
-	char name[64];
-} ParticleUndo;
-
-typedef struct ParticleEdit {
-	ListBase undo;
-	struct ParticleUndo *curundo;
-
-	ParticleEditKey **keys;
-	int totkeys;
-
-	int *mirror_cache;
-
-	struct KDTree *emitter_field;
-	float *emitter_cosnos;
-
-	char sel_col[3];
-	char nosel_col[3];
-} ParticleEdit;
-
 typedef struct ParticleThreadContext {
 	/* shared */
 	struct Scene *scene;
@@ -240,7 +204,7 @@
 void psys_free_boid_rules(struct ListBase *list);
 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_path_cache(struct ParticleSystem *psys, struct PTCacheEdit *edit);
 void free_hair(struct ParticleSystem *psys, int softbody);
 void free_keyed_keys(struct ParticleSystem *psys);
 void psys_free(struct Object * ob, struct ParticleSystem * psys);
@@ -271,9 +235,9 @@
 
 void psys_find_parents(struct Object *ob, struct ParticleSystemModifierData *psmd, struct ParticleSystem *psys);
 
-void psys_cache_paths(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys, float cfra, int editupdate);
+void psys_cache_paths(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys, float cfra);
+void psys_cache_edit_paths(struct Scene *scene, struct Object *ob, struct PTCacheEdit *edit, float cfra);
 void psys_cache_child_paths(struct Scene *scene, struct Object *ob, struct ParticleSystem *psys, float cfra, int editupdate);
-void psys_update_world_cos(struct Object *ob, struct ParticleSystem *psys);
 int do_guide(struct Scene *scene, struct ParticleKey *state, int pa_num, float time, struct ListBase *lb);
 float psys_get_size(struct Object *ob, struct Material *ma, struct ParticleSystemModifierData *psmd, struct IpoCurve *icu_size, struct ParticleSystem *psys, struct ParticleSettings *part, struct ParticleData *pa, float *vg_size);
 float psys_get_timestep(struct ParticleSettings *part);
@@ -359,12 +323,6 @@
 #define PSYS_EC_PARTICLE	4
 #define PSYS_EC_REACTOR		8
 
-/* ParticleEditKey->flag */
-#define PEK_SELECT		1
-#define PEK_TO_SELECT	2
-#define PEK_TAG			4
-#define PEK_HIDE		8
-
 /* index_dmcache */
 #define DMCACHE_NOTFOUND	-1
 #define DMCACHE_ISCHILD		-2

Modified: branches/ge_dyn_load/source/blender/blenkernel/BKE_pointcache.h
===================================================================
--- branches/ge_dyn_load/source/blender/blenkernel/BKE_pointcache.h	2009-08-29 23:55:35 UTC (rev 22877)
+++ branches/ge_dyn_load/source/blender/blenkernel/BKE_pointcache.h	2009-08-30 00:18:51 UTC (rev 22878)
@@ -101,6 +101,8 @@
 	void *cur[BPHYS_TOT_DATA];
 } PTCacheFile;
 
+#define PTCACHE_VEL_PER_SEC		1
+
 typedef struct PTCacheID {
 	struct PTCacheID *next, *prev;
 
@@ -109,6 +111,7 @@
 	void *calldata;
 	int type;
 	int stack_index;
+	int flag;
 
 	/* flags defined in DNA_object_force.h */
 	unsigned int data_types, info_types;
@@ -151,6 +154,75 @@
 	void *progresscontext;
 } PTCacheBaker;
 
+/* PTCacheEditKey->flag */
+#define PEK_SELECT		1
+#define PEK_TAG			2
+#define PEK_HIDE		4
+#define PEK_USE_WCO		8
+
+typedef struct PTCacheEditKey{
+	float *co;
+	float *vel;
+	float *rot;
+	float *time;
+
+	float world_co[3];
+	float ftime;
+	float length;
+	short flag;
+} PTCacheEditKey;
+
+/* PTCacheEditPoint->flag */
+#define PEP_TAG				1
+#define PEP_EDIT_RECALC		2
+#define PEP_TRANSFORM		4
+#define PEP_HIDE			8
+
+typedef struct PTCacheEditPoint {
+	struct PTCacheEditKey *keys;
+	int totkey;
+	short flag;
+} PTCacheEditPoint;
+
+typedef struct PTCacheUndo {
+	struct PTCacheUndo *next, *prev;
+	struct PTCacheEditPoint *points;
+
+	/* particles stuff */
+	struct ParticleData *particles;
+	struct KDTree *emitter_field;
+	float *emitter_cosnos;
+
+	/* cache stuff */
+	struct ListBase mem_cache;
+
+	int totpoint;
+	char name[64];
+} PTCacheUndo;
+
+typedef struct PTCacheEdit {
+	ListBase undo;
+	struct PTCacheUndo *curundo;
+	PTCacheEditPoint *points;
+
+	struct PTCacheID pid;
+
+	/* particles stuff */
+	struct ParticleSystem *psys;
+	struct ParticleData *particles;
+	struct KDTree *emitter_field;
+	float *emitter_cosnos;
+	int *mirror_cache;
+
+	struct ParticleCacheKey **pathcache;	/* path cache (runtime) */
+	ListBase pathcachebufs;
+
+	int totpoint, totframes, totcached, edited;
+
+	char sel_col[3];
+	char nosel_col[3];
+} PTCacheEdit;
+
 /* Particle functions */
 void BKE_ptcache_make_particle_key(struct ParticleKey *key, int index, void **data, float time);
 
@@ -179,6 +251,10 @@
 /* Size of cache data type. */
 int		BKE_ptcache_data_size(int data_type);
 
+/* Memory cache read/write helpers. */
+void BKE_ptcache_mem_init_pointers(struct PTCacheMem *pm);
+void BKE_ptcache_mem_incr_pointers(struct PTCacheMem *pm);
+
 /* Copy a specific data type from cache data to point data. */
 void	BKE_ptcache_data_get(void **data, int type, int index, void *to);
 
@@ -197,7 +273,7 @@
 
 /******************* Allocate & free ***************/
 struct PointCache *BKE_ptcache_add(struct ListBase *ptcaches);
-void BKE_ptache_free_mem(struct PointCache *cache);
+void BKE_ptcache_free_mem(struct ListBase *mem_cache);
 void BKE_ptcache_free(struct PointCache *cache);
 void BKE_ptcache_free_list(struct ListBase *ptcaches);
 struct PointCache *BKE_ptcache_copy_list(struct ListBase *ptcaches_new, struct ListBase *ptcaches_old);

Deleted: branches/ge_dyn_load/source/blender/blenkernel/BKE_sculpt.h
===================================================================
--- branches/ge_dyn_load/source/blender/blenkernel/BKE_sculpt.h	2009-08-29 23:55:35 UTC (rev 22877)
+++ branches/ge_dyn_load/source/blender/blenkernel/BKE_sculpt.h	2009-08-30 00:18:51 UTC (rev 22878)
@@ -1,72 +0,0 @@
-/*
- * $Id$
- *
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software  Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * The Original Code is Copyright (C) 2007 by Nicholas Bishop
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef BKE_SCULPT_H
-#define BKE_SCULPT_H
-
-struct MFace;
-struct MultireModifierData;
-struct MVert;
-struct Object;
-struct StrokeCache;
-
-typedef struct SculptSession {
-	struct ProjVert *projverts;
-
-	/* Mesh data (not copied) can come either directly from a Mesh, or from a MultiresDM */
-	struct MultiresModifierData *multires; /* Special handling for multires meshes */
-	struct MVert *mvert;
-	struct MFace *mface;
-	int totvert, totface;
-	float *face_normals;
-	
-	/* Mesh connectivity */
-	struct ListBase *fmap;

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list