[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18448] branches/blender2.5/blender/source /blender: RNA
Revision: 18448 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18448 Author: blendix Date: 2009-01-10 23:57:33 +0100 (Sat, 10 Jan 2009) Log Message: --- RNA * Finished DNA_lamp_types.h, DNA_world_types.h and DNA_sound_types.h. * Renamed "parent" struct property to "nested", and also remaining "from" usage to "base". * Added a NEVER_NULL subtype for pointers and use it for all properties that apply. * Make sure all structs have a description, and fix any other DOC_BROKEN descriptions, also many other naming consistency improvements. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c branches/blender2.5/blender/source/blender/makesrna/RNA_access.h branches/blender2.5/blender/source/blender/makesrna/RNA_define.h branches/blender2.5/blender/source/blender/makesrna/RNA_types.h branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_ID.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_actuator.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_armature.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_camera.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_cloth.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_color.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_controller.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_curve.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_fluidsim.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_group.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_image.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal_types.h branches/blender2.5/blender/source/blender/makesrna/intern/rna_ipo.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_key.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_lamp.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_lattice.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_main.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_mesh.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_meta.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_modifier.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_nodetree.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_object.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_object_force.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_packedfile.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_particle.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_pose.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_property.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_radio.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_rna.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_screen.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_scriptlink.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_sensor.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_sequence.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_sound.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_text.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_texture.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_vfont.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_wm.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_world.c branches/blender2.5/blender/source/blender/python/epy_doc_gen.py Modified: branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c === --- branches/blender2.5/blender/source/blender/editors/space_outliner/outliner.c 2009-01-10 19:4
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18447] branches/blender2.5/blender/source /blender/editors/transform: 2.5
Revision: 18447
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18447
Author: theeth
Date: 2009-01-10 20:45:48 +0100 (Sat, 10 Jan 2009)
Log Message:
---
2.5
Transform operator replay support for constraints.
Code isn't nice, will have to split some properties to separate what's part of
the "saved data" from operator arguments.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/transform/transform.c
branches/blender2.5/blender/source/blender/editors/transform/transform_constraints.c
branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform.c
===
--- branches/blender2.5/blender/source/blender/editors/transform/transform.c
2009-01-10 19:34:23 UTC (rev 18446)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform.c
2009-01-10 19:45:48 UTC (rev 18447)
@@ -710,9 +710,9 @@
stopConstraint(t);
}
else {
- if (event->keymodifier
== 0)
+ if ((t->modifiers &
MOD_CONSTRAINT_PLANE) == 0)
setUserConstraint(t, (CON_AXIS0), "along %s X");
- else if
(event->keymodifier == KM_SHIFT)
+ else if (t->modifiers &
MOD_CONSTRAINT_PLANE)
setUserConstraint(t, (CON_AXIS1|CON_AXIS2), "locking %s X");
}
}
@@ -722,9 +722,9 @@
setConstraint(t, mati,
(CON_AXIS0), "along X axis");
}
else {
- if (event->keymodifier == 0)
+ if ((t->modifiers &
MOD_CONSTRAINT_PLANE) == 0)
setConstraint(t, mati,
(CON_AXIS0), "along global X");
- else if (event->keymodifier ==
KM_SHIFT)
+ else if (t->modifiers &
MOD_CONSTRAINT_PLANE)
setConstraint(t, mati,
(CON_AXIS1|CON_AXIS2), "locking global X");
}
}
@@ -742,9 +742,9 @@
stopConstraint(t);
}
else {
- if (event->keymodifier
== 0)
+ if ((t->modifiers &
MOD_CONSTRAINT_PLANE) == 0)
setUserConstraint(t, (CON_AXIS1), "along %s Y");
- else if
(event->keymodifier == KM_SHIFT)
+ else if (t->modifiers &
MOD_CONSTRAINT_PLANE)
setUserConstraint(t, (CON_AXIS0|CON_AXIS2), "locking %s Y");
}
}
@@ -754,9 +754,9 @@
setConstraint(t, mati,
(CON_AXIS1), "along Y axis");
}
else {
- if (event->keymodifier == 0)
+ if ((t->modifiers &
MOD_CONSTRAINT_PLANE) == 0)
setConstraint(t, mati,
(CON_AXIS1), "along global Y");
- else if (event->keymodifier ==
KM_SHIFT)
+ else if (t->modifiers &
MOD_CONSTRAINT_PLANE)
setConstraint(t, mati,
(CON_AXIS0|CON_AXIS2), "locking global Y");
}
}
@@ -770,16 +770,16 @@
stopConstraint(t);
}
else {
- if (even
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18446] branches/blender2.5/blender/source /blender: 2.5
Revision: 18446
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18446
Author: ton
Date: 2009-01-10 20:34:23 +0100 (Sat, 10 Jan 2009)
Log Message:
---
2.5
Instead of many commits, here 1!
- Constraint edit code back
- Removed XXX stubs for constraints
(make parent follow path works)
- Removed XXX stubs for armature
(make parent deform, do center, etc works)
- Found a bad uninitialized global Scene * in code, especially
in kernel it wreaked havoc.
- added missing include in blenkernel/brush.c
- fixed Nicholas' fix for editmode subsurf crash
(It needed to check for editmode)
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_pointcache.h
branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/blenkernel/intern/softbody.c
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_mesh.h
branches/blender2.5/blender/source/blender/editors/include/ED_object.h
branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
branches/blender2.5/blender/source/blender/editors/object/Makefile
branches/blender2.5/blender/source/blender/editors/object/SConscript
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/object/object_intern.h
branches/blender2.5/blender/source/blender/python/intern/stubs.c
Added Paths:
---
branches/blender2.5/blender/source/blender/editors/object/editconstraint.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
2009-01-10 18:33:16 UTC (rev 18445)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_armature.h
2009-01-10 19:34:23 UTC (rev 18446)
@@ -69,7 +69,9 @@
#ifdef __cplusplus
extern "C" {
#endif
+
struct bArmature *add_armature(char *name);
+struct bArmature *get_armature(struct Object *ob);
void free_boneChildren(struct Bone *bone);
void free_bones (struct bArmature *arm);
void unlink_armature(struct bArmature *arm);
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
2009-01-10 18:33:16 UTC (rev 18445)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_particle.h
2009-01-10 19:34:23 UTC (rev 18446)
@@ -152,6 +152,7 @@
typedef struct ParticleThreadContext {
/* shared */
+ struct Scene *scene;
struct Object *ob;
struct DerivedMesh *dm;
struct ParticleSystemModifierData *psmd;
@@ -243,7 +244,7 @@
void psys_cache_paths(struct Scene *scene, struct Object *ob, struct
ParticleSystem *psys, float cfra, int editupdate);
void psys_cache_child_paths(struct Scene *scene, struct Object *ob, struct
ParticleSystem *psys, float cfra, int editupdate);
-int do_guide(struct ParticleKey *state, int pa_num, float time, struct
ListBase *lb);
+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);
float psys_get_child_time(struct ParticleSystem *psys, struct ChildParticle
*cpa, float cfra);
@@ -294,9 +295,8 @@
/* particle_system.c */
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 do_effectors(int pa_no, struct ParticleData *pa, struct ParticleKey
*state, struct Object *ob, struct ParticleSystem *psys, float *texco, float
*force_field, f
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18445] branches/blender2.5/blender/source /blender/editors: 2.5
Revision: 18445
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18445
Author: theeth
Date: 2009-01-10 19:33:16 +0100 (Sat, 10 Jan 2009)
Log Message:
---
2.5
Transform draw callback: constraints, snapping, prop circle
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h
branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/editors/transform/transform.c
branches/blender2.5/blender/source/blender/editors/transform/transform.h
branches/blender2.5/blender/source/blender/editors/transform/transform_constraints.c
branches/blender2.5/blender/source/blender/editors/transform/transform_generics.c
branches/blender2.5/blender/source/blender/editors/transform/transform_snap.c
Modified:
branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h
===
--- branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h
2009-01-10 17:38:29 UTC (rev 18444)
+++ branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h
2009-01-10 18:33:16 UTC (rev 18445)
@@ -116,11 +116,6 @@
char * BIF_menustringTransformOrientation(char *title); /* the returned value
was allocated and needs to be freed after use */
int BIF_countTransformOrientation();
-/* Drawing callbacks */
-void BIF_drawConstraint(void);
-void BIF_drawPropCircle(void);
-void BIF_drawSnap(void);
-
void BIF_getPropCenter(float *center);
void BIF_TransformSetUndo(char *str);
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
===
--- branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
2009-01-10 17:38:29 UTC (rev 18444)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
2009-01-10 18:33:16 UTC (rev 18445)
@@ -83,6 +83,8 @@
int view3d_test_clipping(struct View3D *v3d, float *vec);
void view3d_align_axis_to_vector(struct Scene *scene, struct View3D *v3d, int
axisidx, float vec[3]);
+void drawcircball(int mode, float *cent, float rad, float tmat[][4]);
+
/* backbuffer select and draw support */
struct ImBuf *view3d_read_backbuf(struct ViewContext *vc, short xmin, short
ymin, short xmax, short ymax);
unsigned int view3d_sample_backbuf_rect(struct ViewContext *vc, short mval[2],
int size, unsigned int min, unsigned int max, int *dist, short strict, unsigned
int (*indextest)(unsigned int index));
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
===
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
2009-01-10 17:38:29 UTC (rev 18444)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
2009-01-10 18:33:16 UTC (rev 18445)
@@ -86,7 +86,6 @@
/* drawobject.c */
void draw_object(Scene *scene, struct ARegion *ar, View3D *v3d, Base *base,
int flag);
int draw_glsl_material(Scene *scene, Object *ob, View3D *v3d, int dt);
-void drawcircball(int mode, float *cent, float rad, float tmat[][4]);
void draw_object_instance(Scene *scene, View3D *v3d, Object *ob, int dt, int
outline);
void draw_object_backbufsel(Scene *scene, View3D *v3d, Object *ob);
void drawaxes(float size, int flag, char drawtype);
Modified:
branches/blender2.5/blender/source/blender/editors/transform/transform.c
===
--- branches/blender2.5/blender/source/blender/editors/transform/transform.c
2009-01-10 17:38:29 UTC (rev 18444)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform.c
2009-01-10 18:33:16 UTC (rev 18445)
@@ -99,6 +99,8 @@
#include "ED_view3d.h"
#include "ED_screen.h"
#include "ED_util.h"
+#include "ED_space_api.h"
+
#include "UI_view2d.h"
#include "WM_types.h"
#include "WM_api.h"
@@ -115,15 +117,6 @@
#include "transform.h"
-/ Helper functions
/
-
-/* GLOBAL Wrapper Fonctions */
-
-//void BIF_drawSnap()
-//{
-// drawSnapping(&Trans);
-//}
-
/* ** Dashed help line */
@@ -959,6 +952,15 @@
return success;
}
+void drawTransform(const struct bContext *C, struct ARegion *ar, void *arg)
+{
+ TransInfo *t = arg;
+
+ drawConstraint(t);
+ drawPropCircle(t);
+ drawSnapping(t);
+}
+
void saveTransform(bContext *C, TransInfo *t, wmOperator *op)
{
RNA_int_set(op->ptr, "mode", t->mode);
@@ -988,6 +990,8 @@
//calc_manipulator_stats(curarea);
Mat3CpyMat4(t->spac
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18444] branches/blender2.5/blender/source /blender/makesdna/DNA_scene_types.h: 2.5
Revision: 18444 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18444 Author: ton Date: 2009-01-10 18:38:29 +0100 (Sat, 10 Jan 2009) Log Message: --- 2.5 Bugfix; 64 bits alignment error in vpaint. tsk to me! Modified Paths: -- branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h === --- branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h 2009-01-10 17:20:34 UTC (rev 18443) +++ branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h 2009-01-10 17:38:29 UTC (rev 18444) @@ -380,7 +380,7 @@ float size; /* of brush */ float gamma, mul; short mode, flag; - int tot, pad; /* allocation size of prev buffers */ + int tot;/* allocation size of prev buffers */ unsigned int *vpaint_prev; /* previous mesh colors */ struct MDeformVert *wpaint_prev;/* previous vertex weights */ ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18443] branches/blender2.5/blender/source /blender: 2.5
Revision: 18443
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18443
Author: ton
Date: 2009-01-10 18:20:34 +0100 (Sat, 10 Jan 2009)
Log Message:
---
2.5
Removed another bad global "editbutvweight", a value from buttons
used to paint weights with, or to set weights. Is now part of
weightpaint struct in scene.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
branches/blender2.5/blender/source/blender/editors/space_view3d/vpaint.c
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
===
--- branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
2009-01-10 16:49:22 UTC (rev 18442)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
2009-01-10 17:20:34 UTC (rev 18443)
@@ -678,9 +678,8 @@
}
/* Only available in editmode */
-void assign_verts_defgroup (Object *obedit)
+void assign_verts_defgroup (Object *obedit, float weight)
{
- float editbutvweight; /* XXX */
Object *ob;
EditVert *eve;
bDeformGroup *dg, *eg;
@@ -722,7 +721,7 @@
eg = BLI_findlink (&ob->defbase,
dvert->dw[i].def_nr);
/* Find the actual group */
if (eg==dg){
-
dvert->dw[i].weight=editbutvweight;
+ dvert->dw[i].weight= weight;
done=1;
break;
}
@@ -736,7 +735,7 @@
}
dvert->dw=newdw;
- dvert->dw[dvert->totweight].weight=
editbutvweight;
+ dvert->dw[dvert->totweight].weight=
weight;
dvert->dw[dvert->totweight].def_nr=
ob->actdef-1;
dvert->totweight++;
@@ -757,7 +756,7 @@
tot= editLatt->pntsu*editLatt->pntsv*editLatt->pntsw;
for(a=0, bp= editLatt->def; af1 & SELECT)
- add_vert_defnr (ob, ob->actdef-1, a,
editbutvweight, WEIGHT_REPLACE);
+ add_vert_defnr (ob, ob->actdef-1, a,
weight, WEIGHT_REPLACE);
}
}
break;
@@ -969,13 +968,14 @@
* and Lattices. (currently only restricted to those two)
* It is only responsible for
*/
-void vgroup_assign_with_menu(Object *ob)
+void vgroup_assign_with_menu(Scene *scene, Object *ob)
{
+ VPaint *wp= scene->toolsettings->wpaint;
int defCount;
int mode;
/* prevent crashes */
- if (ob==NULL) return;
+ if (wp==NULL || ob==NULL) return;
defCount= BLI_countlist(&ob->defbase);
@@ -989,11 +989,11 @@
switch (mode) {
case 1: /* add to new group */
add_defgroup(ob);
- assign_verts_defgroup(ob);
+ assign_verts_defgroup(ob, wp->weight);
BIF_undo_push("Assign to vertex group");
break;
case 2: /* add to current group */
- assign_verts_defgroup(ob);
+ assign_verts_defgroup(ob, wp->weight);
BIF_undo_push("Assign to vertex group");
break;
case 3: /* remove from current group */
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/vpaint.c
===
--- branches/blender2.5/blender/source/blender/editors/space_view3d/vpaint.c
2009-01-10 16:49:22 UTC (rev 18442)
+++ branches/blender2.5/blender/source/blender/editors/space_view3d/vpaint.c
2009-01-10 17:20:34 UTC (rev 18443)
@@ -119,6 +119,7 @@
vp->flag= VP_AREA+VP_SOFT+VP_SPRAY;
if(wpaint) {
+ vp->weight= 1.0f;
vp->a= 1.0f;
vp->flag= VP_AREA+VP_SOFT;
}
@@ -358,8 +359,7 @@
void clear_wpaint_selectedfaces(Scene *scene)
{
VPaint *wp= scene->toolsettings->wpaint;
- float editbutvweight;
- float paintweight= editbutvweight;
+ float paintweight= wp->weight;
Mesh *me;
MFace *mface;
Object *ob;
@@ -426,7 +426,7 @@
dw=
verify_defweight(me->dvert+faceverts[i], vgroup);
if(dw) {
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18442] branches/blender2.5/blender/source /blender/editors: 2.5
Revision: 18442
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18442
Author: ton
Date: 2009-01-10 17:49:22 +0100 (Sat, 10 Jan 2009)
Log Message:
---
2.5
Added custom data pointer to custom region_draw_cb
Also removed the test with green rect.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/include/ED_space_api.h
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
Modified:
branches/blender2.5/blender/source/blender/editors/include/ED_space_api.h
===
--- branches/blender2.5/blender/source/blender/editors/include/ED_space_api.h
2009-01-10 16:46:29 UTC (rev 18441)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_space_api.h
2009-01-10 16:49:22 UTC (rev 18442)
@@ -61,8 +61,8 @@
#define REGION_DRAW_POST 0
void *ED_region_draw_cb_activate(struct ARegionType *,
-void
(*draw)(const struct bContext *, struct ARegion *),
-int type);
+void
(*draw)(const struct bContext *, struct ARegion *, void *),
+void
*custumdata, int type);
void ED_region_draw_cb_draw(const struct bContext *, struct ARegion *, int);
void ED_region_draw_cb_exit(struct ARegionType *, void *);
Modified:
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
===
--- branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
2009-01-10 16:46:29 UTC (rev 18441)
+++ branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
2009-01-10 16:49:22 UTC (rev 18442)
@@ -132,20 +132,22 @@
typedef struct RegionDrawCB {
struct RegionDrawCB *next, *prev;
- void(*draw)(const struct bContext *, struct ARegion *);
+ void (*draw)(const struct bContext *, struct ARegion *, void *);
+ void *customdata;
int type;
} RegionDrawCB;
void *ED_region_draw_cb_activate(ARegionType *art,
-void
(*draw)(const struct bContext *, struct ARegion *),
-int type)
+void
(*draw)(const struct bContext *, struct ARegion *, void *),
+void
*customdata, int type)
{
RegionDrawCB *rdc= MEM_callocN(sizeof(RegionDrawCB), "RegionDrawCB");
BLI_addtail(&art->drawcalls, rdc);
rdc->draw= draw;
+ rdc->customdata= customdata;
rdc->type= type;
return rdc;
@@ -170,7 +172,7 @@
for(rdc= ar->type->drawcalls.first; rdc; rdc= rdc->next) {
if(rdc->type==type)
- rdc->draw(C, ar);
+ rdc->draw(C, ar, rdc->customdata);
}
}
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
===
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
2009-01-10 16:46:29 UTC (rev 18441)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
2009-01-10 16:49:22 UTC (rev 18442)
@@ -97,7 +97,6 @@
int origx, origy, oldx, oldy;
int origkey;
- void *vh; // XXX temp
} ViewOpsData;
#define TRACKBALLSIZE (1.1)
@@ -364,10 +363,6 @@
default:
if(event->type==vod->origkey && event->val==0) {
- if(vod->vh) {
-
ED_region_draw_cb_exit(CTX_wm_region(C)->type, vod->vh);
- ED_region_tag_redraw(CTX_wm_region(C));
- }
MEM_freeN(vod);
op->customdata= NULL;
@@ -378,12 +373,6 @@
return OPERATOR_RUNNING_MODAL;
}
-static void vh_draw(const bContext *C, ARegion *ar)
-{
- glColor3ub(100, 200, 100);
- glRectf(-0.2, -0.2, 0.2, 0.2);
-}
-
static int viewrotate_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
ViewOpsData *vod;
@@ -392,8 +381,6 @@
viewops_data(C, op, event);
vod= op->customdata;
- vod->vh= ED_region_draw_cb_activate(CTX_wm_region(C)->type, vh_draw,
REGION_DRAW_POST);
-
/* switch from camera view when: */
if(vod->v3d->persp
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18441] branches/blender2.5/blender/source /blender/editors/include/BIF_transform.h: 2.5
Revision: 18441 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18441 Author: theeth Date: 2009-01-10 17:46:29 +0100 (Sat, 10 Jan 2009) Log Message: --- 2.5 rename transform mode enum to something proper Modified Paths: -- branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h Modified: branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h === --- branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h 2009-01-10 14:19:14 UTC (rev 18440) +++ branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h 2009-01-10 16:46:29 UTC (rev 18441) @@ -72,7 +72,7 @@ TFM_BEVEL, TFM_BWEIGHT, TFM_ALIGN -} TfmModesInputFlags; +} TfmMode; /* TRANSFORM CONTEXTS */ #define CTX_NONE 0 ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18440] branches/blender2.5/blender/source /blender: 2.5
Revision: 18440
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18440
Author: ton
Date: 2009-01-10 15:19:14 +0100 (Sat, 10 Jan 2009)
Log Message:
---
2.5
- Weightpaint back (CTRL+TAB or menu)
Also weightpaint is sortof non-modal, allowing to use all existing
hotkeys while in paint mode. Only leftmouse is overridden.
- Made vpaint and wpaint entirely local, stored in scene (and saved!)
- Small bugfix (also in 2.48): on weightpaint mode, all armature objects
in 3d window were drawing as active poses. Now only the armature
deformer is.
Nice point for the UI agenda: are paint modes on ACTION mouse? Only then
you can combine it with SELECT mouse...
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
branches/blender2.5/blender/source/blender/editors/animation/anim_deps.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/armature/meshlaplacian.c
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
branches/blender2.5/blender/source/blender/editors/include/ED_anim_api.h
branches/blender2.5/blender/source/blender/editors/include/ED_armature.h
branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h
branches/blender2.5/blender/source/blender/editors/mesh/meshtools.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawarmature.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_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_select.c
branches/blender2.5/blender/source/blender/editors/space_view3d/vpaint.c
branches/blender2.5/blender/source/blender/editors/util/ed_util.c
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
2009-01-10 14:03:00 UTC (rev 18439)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
2009-01-10 14:19:14 UTC (rev 18440)
@@ -2054,15 +2054,16 @@
{
Mesh *me = ob->data;
float min[3], max[3];
- int needMapping= 0; //
+ //int needMapping= 0;
+ Object *obact = scene->basact?scene->basact->object:NULL;
+ int editing = (FACESEL_PAINT_TEST)|(G.f & G_PARTICLEEDIT);
+ int needMapping = editing && (ob==obact);
+
clear_mesh_caches(ob);
-// XXX Object *obact = scene->basact?scene->basact->object:NULL;
-// int editing = (FACESEL_PAINT_TEST)|(G.f & G_PARTICLEEDIT);
-// int needMapping = editing && (ob==obact);
-// if( (G.f & G_WEIGHTPAINT) && ob==obact ) {
- if(dataMask & CD_MASK_WEIGHTPAINT) {
+ if( (G.f & G_WEIGHTPAINT) && ob==obact ) {
+// if(dataMask & CD_MASK_WEIGHTPAINT) {
MCol *wpcol = (MCol*)calc_weightpaint_colors(ob);
int layernum = CustomData_number_of_layers(&me->fdata, CD_MCOL);
int prevactive = CustomData_get_active_layer(&me->fdata,
CD_MCOL);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
2009-01-10 14:03:00 UTC (rev 18439)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
2009-01-10 14:19:14 UTC (rev 18440)
@@ -167,7 +167,12 @@
BLI_freelistN(&sce->transform_spaces);
BLI_freelistN(&sce->r.layers);
- if(sce->toolsettings){
+ if(sce->toolsettings) {
+ if(sce->toolsettings->vpaint)
+ MEM_freeN(sce->toolsettings->vpaint);
+ if(sce->toolsettings->wpaint)
+ MEM_freeN(sce->toolsettings->wpaint);
+
MEM_freeN(sce->toolsettings);
sce->toolsettings = NULL;
}
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===
--- branches/blender2.5/blender/source/blender/blenloader/intern/rea
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18439] branches/blender2.5/blender/source /blender/editors/interface: 2.5
Revision: 18439
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18439
Author: ton
Date: 2009-01-10 15:03:00 +0100 (Sat, 10 Jan 2009)
Log Message:
---
2.5
Popup menus were tagged with wrong direction, so arrow keys or
scrollwheel didn't work.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
===
---
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2009-01-10 03:44:02 UTC (rev 18438)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_handlers.c
2009-01-10 14:03:00 UTC (rev 18439)
@@ -3338,14 +3338,13 @@
if(inside || (block->flag & UI_BLOCK_LOOP)) {
if(event->val) {
but= ui_but_find_activated(ar);
-
if(but) {
- if(ELEM(event->type,
UPARROWKEY, WHEELUPMOUSE)) {
-
if(block->direction & UI_TOP) but= ui_but_next(but);
+ if(ELEM(event->type,
DOWNARROWKEY, WHEELDOWNMOUSE)) {
+
if(block->direction & UI_DOWN) but= ui_but_next(but);
else but=
ui_but_prev(but);
}
else {
-
if(block->direction & UI_TOP) but= ui_but_prev(but);
+
if(block->direction & UI_DOWN) but= ui_but_prev(but);
else but=
ui_but_next(but);
}
Modified:
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
===
---
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
2009-01-10 03:44:02 UTC (rev 18438)
+++
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
2009-01-10 14:03:00 UTC (rev 18439)
@@ -672,7 +672,6 @@
saferct= MEM_callocN(sizeof(uiSafetyRct), "uiSafetyRct");
saferct->safety= block->safety;
BLI_addhead(&block->saferct, saferct);
- block->direction= UI_TOP;
}
/* the block and buttons were positioned in window space as in 2.4x, now
@@ -1340,6 +1339,7 @@
block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP, UI_HELV);
uiBlockSetFlag(block,
UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_NUMSELECT);
block->themecol= TH_MENU_ITEM;
+ block->direction= UI_DOWN;
md= decompose_menu_string(info->instr);
@@ -1503,6 +1503,7 @@
block= uiBeginBlock(C, handle->region, "menu", UI_EMBOSSP, UI_HELV);
uiBlockSetFlag(block,
UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_RET_1|UI_BLOCK_NUMSELECT);
block->themecol= TH_MENU_ITEM;
+ block->direction= UI_DOWN;
md= decompose_menu_string(info->instr);
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
