Revision: 18650
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18650
Author: ton
Date: 2009-01-24 14:45:24 +0100 (Sat, 24 Jan 2009)
Log Message:
-----------
2.5
- Brought back code for particle edit and fluidsim
- Sanitized code from globals and bad level calls,
so its ready to come back working.
- Fixed cirle selecting (Ckey now)
- Enabled undo for editmode curve, armature, particle
and lattice
(another commit following)
Modified Paths:
--------------
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
branches/blender2.5/blender/source/blender/blenkernel/intern/BME_conversions.c
branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/editors/SConscript
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/include/ED_armature.h
branches/blender2.5/blender/source/blender/editors/include/ED_curve.h
branches/blender2.5/blender/source/blender/editors/include/ED_object.h
branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/editors/util/undo.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/include/ED_editparticle.h
branches/blender2.5/blender/source/blender/editors/include/ED_fluidsim.h
branches/blender2.5/blender/source/blender/editors/physics/editparticle.c
branches/blender2.5/blender/source/blender/editors/physics/fluidsim.c
branches/blender2.5/blender/source/blender/editors/physics/physics_intern.h
Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile 2009-01-24 11:35:14 UTC (rev
18649)
+++ branches/blender2.5/blender/source/Makefile 2009-01-24 13:45:24 UTC (rev
18650)
@@ -243,6 +243,7 @@
PULIB += $(OCGDIR)/blender/ed_armature/libed_armature.a
PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a
PULIB += $(OCGDIR)/blender/ed_sculpt/libed_sculpt.a
+PULIB += $(OCGDIR)/blender/ed_physics/libed_physics.a
PULIB += $(OCGDIR)/blender/ed_animation/libed_animation.a
PULIB += $(OCGDIR)/blender/ed_transform/libed_transform.a
PULIB += $(OCGDIR)/blender/ed_util/libed_util.a
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
2009-01-24 11:35:14 UTC (rev 18649)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
2009-01-24 13:45:24 UTC (rev 18650)
@@ -301,6 +301,10 @@
void psys_calc_dmcache(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);
+void reset_particle(struct Scene *scene, 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);
+
+
/* psys_reset */
#define PSYS_RESET_ALL 1
#define PSYS_RESET_DEPSGRAPH 2
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/BME_conversions.c
===================================================================
---
branches/blender2.5/blender/source/blender/blenkernel/intern/BME_conversions.c
2009-01-24 11:35:14 UTC (rev 18649)
+++
branches/blender2.5/blender/source/blender/blenkernel/intern/BME_conversions.c
2009-01-24 13:45:24 UTC (rev 18650)
@@ -427,8 +427,9 @@
efa->f |= SELECT;
}
if(f->flag & ME_HIDE) efa->h= 1;
- if((G.f & G_FACESELECT) && (efa->f & SELECT))
- ; //XXX EM_select_face(efa, 1); /* flush down */
+ // XXX flag depricated
+ // if((G.f & G_FACESELECT) && (efa->f & SELECT))
+ //XXX EM_select_face(efa, 1); /* flush down */
CustomData_em_copy_data(&bm->pdata, &em->fdata,
f->data, &efa->data);
BME_loops_to_corners(bm, &em->fdata, efa->data,
f,numCol,numTex);
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
2009-01-24 11:35:14 UTC (rev 18649)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
2009-01-24 13:45:24 UTC (rev 18650)
@@ -86,7 +86,6 @@
#ifndef DISABLE_ELBEEM
#include "DNA_object_fluidsim.h"
#include "LBM_fluidsim.h"
-#include "elbeem.h"
#include <zlib.h>
#include <string.h>
#endif // DISABLE_ELBEEM
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
2009-01-24 11:35:14 UTC (rev 18649)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/fluidsim.c
2009-01-24 13:45:24 UTC (rev 18650)
@@ -52,7 +52,6 @@
// headers for fluidsim bobj meshes
#include <stdlib.h>
#include "LBM_fluidsim.h"
-#include "elbeem.h"
#include <zlib.h>
#include <string.h>
#include <stdio.h>
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
---
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
2009-01-24 11:35:14 UTC (rev 18649)
+++
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
2009-01-24 13:45:24 UTC (rev 18650)
@@ -84,7 +84,6 @@
#ifndef DISABLE_ELBEEM
#include "DNA_object_fluidsim.h"
#include "LBM_fluidsim.h"
-#include "elbeem.h"
#include <zlib.h>
#include <string.h>
@@ -1689,7 +1688,7 @@
}
}
/* sets particle to the emitter surface with initial velocity & rotation */
-static void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem
*psys, ParticleSystemModifierData *psmd, Object *ob,
+void reset_particle(Scene *scene, ParticleData *pa, ParticleSystem *psys,
ParticleSystemModifierData *psmd, Object *ob,
float dtime, float cfra, float *vg_vel,
float *vg_tan, float *vg_rot)
{
ParticleSettings *part;
@@ -4364,7 +4363,7 @@
gzf = gzopen(filename, "rb");
if (!gzf) {
snprintf(debugStrBuffer,256,"readFsPartData::error - Unable to open file for
reading '%s' \n", filename);
- //elbeemDebugOut(debugStrBuffer);
+ elbeemDebugOut(debugStrBuffer);
return;
}
@@ -4424,7 +4423,9 @@
totpart = psys->totpart = activeParts;
snprintf(debugStrBuffer,256,"readFsPartData::done -
particles:%d, active:%d, file:%d, mask:%d \n",
psys->totpart,activeParts,fileParts,readMask);
- elbeemDebugOut(debugStrBuffer);
+ // bad level call
+ // XXX elbeemDebugOut(debugStrBuffer);
+
} // fluid sim particles done
}
#endif // DISABLE_ELBEEM
Modified: branches/blender2.5/blender/source/blender/editors/SConscript
===================================================================
--- branches/blender2.5/blender/source/blender/editors/SConscript
2009-01-24 11:35:14 UTC (rev 18649)
+++ branches/blender2.5/blender/source/blender/editors/SConscript
2009-01-24 13:45:24 UTC (rev 18650)
@@ -12,7 +12,7 @@
'object/SConscript',
'curve/SConscript',
'gpencil/SConscript',
- #'physics/SConscript', enable this when there is
actually code in physics/
+ 'physics/SConscript',
'preview/SConscript',
'space_buttons/SConscript',
'space_file/SConscript',
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-01-24 11:35:14 UTC (rev 18649)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-01-24 13:45:24 UTC (rev 18650)
@@ -1984,11 +1984,21 @@
MEM_freeN(lb);
}
+static void *get_armature_edit(bContext *C)
+{
+ Object *obedit= CTX_data_edit_object(C);
+ if(obedit && obedit->type==OB_ARMATURE) {
+ bArmature *arm= obedit->data;
+ return arm->edbo;
+ }
+ return NULL;
+}
+
/* and this is all the undo system needs to know */
void undo_push_armature(bContext *C, char *name)
{
// XXX solve getdata()
- undo_editmode_push(C, name, NULL, free_undoBones,
undoBones_to_editBones, editBones_to_undoBones, NULL);
+ undo_editmode_push(C, name, get_armature_edit, free_undoBones,
undoBones_to_editBones, editBones_to_undoBones, NULL);
}
Modified:
branches/blender2.5/blender/source/blender/editors/include/ED_armature.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_armature.h
2009-01-24 11:35:14 UTC (rev 18649)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_armature.h
2009-01-24 13:45:24 UTC (rev 18650)
@@ -104,6 +104,8 @@
void auto_align_armature(struct Scene *scene, struct View3D *v3d, short mode);
void unique_editbone_name (ListBase *edbo, char *name);
+void undo_push_armature(struct bContext *C, char *name);
+
/* poseobject.c */
void ED_armature_exit_posemode(struct Base *base);
void ED_armature_enter_posemode(struct Base *base);
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_curve.h
===================================================================
--- branches/blender2.5/blender/source/blender/editors/include/ED_curve.h
2009-01-24 11:35:14 UTC (rev 18649)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_curve.h
2009-01-24 13:45:24 UTC (rev 18650)
@@ -36,8 +36,8 @@
struct View3D;
/* curve_ops.c */
-void ED_operatortypes_curve(void);
-void ED_keymap_curve(struct wmWindowManager *wm);
+void ED_operatortypes_curve(void);
+void ED_keymap_curve (struct wmWindowManager *wm);
/* editcurve.c */
void undo_push_curve (struct bContext *C, char *name);
@@ -48,13 +48,14 @@
void remake_editNurb (struct Object *obedit);
void free_editNurb (struct Object *obedit);
-void mouse_nurb(struct bContext *C, short mval[2], int extend);
+void mouse_nurb (struct bContext *C, short mval[2], int extend);
/* editfont.h */
-void make_editText (struct Object *obedit);
-void load_editText (struct Object *obedit);
-void remake_editText (struct Object *obedit);
-void free_editText (struct Object *obedit);
+void undo_push_font (struct bContext *C, char *name);
+void make_editText (struct Object *obedit);
+void load_editText (struct Object *obedit);
+void remake_editText (struct Object *obedit);
+void free_editText (struct Object *obedit);
#endif /* ED_CURVE_H */
Copied:
branches/blender2.5/blender/source/blender/editors/include/ED_editparticle.h
(from rev 18636, trunk/blender/source/blender/include/BIF_editparticle.h)
===================================================================
---
branches/blender2.5/blender/source/blender/editors/include/ED_editparticle.h
(rev 0)
+++
branches/blender2.5/blender/source/blender/editors/include/ED_editparticle.h
2009-01-24 13:45:24 UTC (rev 18650)
@@ -0,0 +1,96 @@
+/*
+ * $Id: ED_editparticle.h $
+ *
+ * ***** 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 Janne Karhu.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
