[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18394] branches/blender2.5/blender/source /blender: 2.5
Revision: 18394
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18394
Author: aligorith
Date: 2009-01-07 10:41:32 +0100 (Wed, 07 Jan 2009)
Log Message:
---
2.5
* Compiling fixes for RNA - removed duplicate RNA wrapping for posechannels,
removed some irrelevant code, and fixed some errors.
* Commented out/removed some evil old stuff from pose-code
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_pose.c
Modified:
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
2009-01-07 04:38:30 UTC (rev 18393)
+++ branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
2009-01-07 09:41:32 UTC (rev 18394)
@@ -462,6 +462,7 @@
curbone->flag &= ~BONE_ACTIVE;
pabone->flag |=
(BONE_ACTIVE|BONE_SELECTED);
+ // XXX this is evil... this
sort of stuff is to be handled in one go as a result of a notifier
select_actionchannel_by_name
(ob->action, pchan->name, 0);
select_actionchannel_by_name
(ob->action, pchan->parent->name, 1);
break;
@@ -477,6 +478,7 @@
curbone->flag &= ~BONE_ACTIVE;
chbone->flag |=
(BONE_ACTIVE|BONE_SELECTED);
+ // XXX this is evil... this
sort of stuff is to be handled in one go as a result of a notifier
select_actionchannel_by_name
(ob->action, pchan->name, 0);
select_actionchannel_by_name
(ob->action, pchan->child->name, 1);
break;
@@ -1325,6 +1327,7 @@
DAG_object_flush_update(scene, OBACT,
OB_RECALC_DATA);
}
+ // XXX this is evil... this sort of stuff is to
be handled in one go as a result of a notifier
select_actionchannel_by_name(ob->action, name,
1);
}
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
===
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
2009-01-07 04:38:30 UTC (rev 18393)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
2009-01-07 09:41:32 UTC (rev 18394)
@@ -30,195 +30,11 @@
#include "rna_internal.h"
#include "DNA_action_types.h"
-#include "DNA_armature_types.h"
#ifdef RNA_RUNTIME
-static float rna_IK_Min_X_get(PointerRNA *ptr)
-{
- bPoseChannel *pchan= (bPoseChannel*)ptr->id.data;
+#else
- return pchan->limitmin[0];
-}
-
-static float rna_IK_Min_Y_get(PointerRNA *ptr)
-{
- bPoseChannel *pchan= (bPoseChannel*)ptr->id.data;
-
- return pchan->limitmin[1];
-}
-
-static float rna_IK_Min_Z_get(PointerRNA *ptr)
-{
- bPoseChannel *pchan= (bPoseChannel*)ptr->id.data;
-
- return pchan->limitmin[2];
-}
-
-static void rna_IK_Min_X_set(PointerRNA *ptr, float value)
-{
- bPoseChannel *pchan= (bPoseChannel*)ptr->id.data;
-
- pchan->limitmin[0] = value;
-}
-
-static void rna_IK_Min_Y_set(PointerRNA *ptr, float value)
-{
- bPoseChannel *pchan= (bPoseChannel*)ptr->id.data;
-
- pchan->limitmin[1] = value;
-}
-
-static void rna_IK_Min_Z_set(PointerRNA *ptr, float value)
-{
- bPoseChannel *pchan= (bPoseChannel*)ptr->id.data;
-
- pchan->limitmin[2] = value;
-}
-
-#else
-
-/* users shouldn't be editing pose channel data directly -- better to set ipos
and let blender calc pose_channel stuff */
-/* it's going to be weird for users to find IK flags and other such here,
instead of in bone where they would expect them
- -- is there any way to put a doc in bone, pointing them here? */
-
-static void RNA_def_pose_channel(BlenderRNA *brna)
-{
- StructRNA *srna;
- PropertyRNA *prop;
-
- static EnumPropertyItem prop_iklimit_items[] = {
- {BONE_IK_NO_XDOF, "IKNOXDOF", "No X DoF", "Prevent motion
around X axis."},
- {BONE_IK_NO_YDOF, "IK
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18395] trunk/blender/release/scripts/ import_web3d.py: don't raise exceptions on some errors unless debugging
Revision: 18395 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18395 Author: campbellbarton Date: 2009-01-07 12:27:17 +0100 (Wed, 07 Jan 2009) Log Message: --- don't raise exceptions on some errors unless debugging Modified Paths: -- trunk/blender/release/scripts/import_web3d.py Modified: trunk/blender/release/scripts/import_web3d.py === --- trunk/blender/release/scripts/import_web3d.py 2009-01-07 09:41:32 UTC (rev 18394) +++ trunk/blender/release/scripts/import_web3d.py 2009-01-07 11:27:17 UTC (rev 18395) @@ -1076,6 +1076,9 @@ # print self.id ok = True while ok: + if i>=len(lines): + return len(lines)-1 + l = lines[i] # print '\tDEBUG:', i, self.node_type, l if l=='': @@ -1085,13 +1088,15 @@ if l=='}': if self.node_type != NODE_NORMAL: # also ends proto nodes, we may want a type for these too. print 'wrong node ending, expected an } ' + str(i) + ' ' + str(self.node_type) - raise ValueError + if DEBUG: + raise ValueError ### print "returning", i return i+1 if l==']': if self.node_type != NODE_ARRAY: print 'wrong node ending, expected a ] ' + str(i) + ' ' + str(self.node_type) - raise ValueError + if DEBUG: + raise ValueError ### print "returning", i return i+1 @@ -2567,12 +2572,12 @@ files.sort() tot = len(files) for i, f in enumerate(files): - #if i < 126 or i > 100: + if i < 124 or i > 100: + continue + + #if i != 1068: # continue - if i != 1068: - continue - #if i != 12686: # continue @@ -2583,4 +2588,4 @@ # Window. load_web3d(f, PREF_FLAT=True) - +# test() ___ 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 [18396] branches/blender2.5/blender/source /blender/makesrna/intern/rna_action.c: Conflicts resolved.
Revision: 18396
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18396
Author: harkyman
Date: 2009-01-07 14:10:31 +0100 (Wed, 07 Jan 2009)
Log Message:
---
Conflicts resolved. Hadn't used the Resolve command last time. Brilliant.
Modified Paths:
--
branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
===
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
2009-01-07 11:27:17 UTC (rev 18395)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_action.c
2009-01-07 13:10:31 UTC (rev 18396)
@@ -30,20 +30,166 @@
#include "rna_internal.h"
#include "DNA_action_types.h"
+#include "DNA_constraint_types.h"
+#include "DNA_scene_types.h"
+
#ifdef RNA_RUNTIME
-#else
+#else
+void rna_def_action_channel(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna= RNA_def_struct(brna, "ActionChannel", NULL);
+ RNA_def_struct_sdna(srna, "bActionChannel");
+ RNA_def_struct_ui_text(srna, "Action Channel", "A channel for one
object or bone's Ipos in an Action.");
+
+ prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+ RNA_def_property_ui_text(prop, "Name", "");
+ RNA_def_struct_name_property(srna, prop);
+
+ prop= RNA_def_property(srna, "action_group", PROP_POINTER, PROP_NONE);
+ RNA_def_property_pointer_sdna(prop, NULL, "grp");
+ RNA_def_property_struct_type(prop, "ActionGroup");
+ RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
+ RNA_def_property_ui_text(prop, "Action Group", "Action Group that this
Action Channel belongs to.");
+
+ prop= RNA_def_property(srna, "ipo", PROP_POINTER, PROP_NONE);
+ RNA_def_property_struct_type(prop, "Ipo");
+ RNA_def_property_flag(prop, PROP_NOT_EDITABLE);
+ RNA_def_property_ui_text(prop, "Ipo", "Ipo block this Action Channel
uses.");
+
+ /* constraint channel rna not yet implemented */
+ /*prop= RNA_def_property(srna, "constraint_channels", PROP_COLLECTION,
PROP_NONE);
+ RNA_def_property_collection_sdna(prop, NULL, "ConstraintChannel", NULL);
+ RNA_def_property_struct_type(prop, "ConstraintChannel");
+ RNA_def_property_ui_text(prop, "Constraint Channels", "Ipos of
Constraints attached to this object or bone."); */
+
+ prop= RNA_def_property(srna, "action_channel_selected", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", ACHAN_SELECTED);
+ RNA_def_property_ui_text(prop, "Selected", "Action Channel is
selected.");
+
+ prop= RNA_def_property(srna, "action_channel_highlighted",
PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", ACHAN_HILIGHTED);
+ RNA_def_property_ui_text(prop, "Highlighted", "Action Channel is
highlighted.");
+
+ prop= RNA_def_property(srna, "action_channel_hidden", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", ACHAN_HIDDEN);
+ RNA_def_property_ui_text(prop, "Hidden", "Action Channel is hidden.");
+
+ prop= RNA_def_property(srna, "action_channel_protected", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", ACHAN_PROTECTED);
+ RNA_def_property_ui_text(prop, "Protected", "Action Channel is
protected.");
+
+ prop= RNA_def_property(srna, "action_channel_expanded", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", ACHAN_EXPANDED);
+ RNA_def_property_ui_text(prop, "Expanded", "Action Channel is
expanded.");
+
+ prop= RNA_def_property(srna, "action_channel_show_ipo", PROP_BOOLEAN,
PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", ACHAN_SHOWIPO);
+ RNA_def_property_ui_text(prop, "Show Ipo", "Action Channel's Ipos are
visible.");
+
+ prop= RNA_def_property(srna, "action_channel_show_constraints",
PROP_BOOLEAN, PROP_NONE);
+ RNA_def_property_boolean_sdna(prop, NULL, "flag", ACHAN_SHOWCONS);
+ RNA_def_property_ui_text(prop, "Show Constraints", "Action Channel's
constraints are visible.");
+}
+
+void rna_def_action_group(BlenderRNA *brna)
+{
+ StructRNA *srna;
+ PropertyRNA *prop;
+
+ srna= RNA_def_struct(brna, "ActionGroup", NULL);
+ RNA_def_struct_sdna(srna, "bActionGroup");
+ RNA_def_struct_ui_text(srna, "Action Group", "Groups of Actions
Channels.");
+
+ prop= RNA_def_property(srna, "name", PROP_STRING, PROP_NONE);
+ RNA_def_property_ui_text(prop, "Name", "");
+ RNA_def_struct_name_property(srna, prop);
+
+ /* dna warns not to treat the Action Channel listbase in the Action
Group struct like a
+ normal listbase. I'll leave this here but comment out, for Joshua to
rev
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18397] branches/blender2.5/blender/source /blender: 2.5
Revision: 18397
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18397
Author: ton
Date: 2009-01-07 15:46:50 +0100 (Wed, 07 Jan 2009)
Log Message:
---
2.5
Finished a couple of XXX todo's in drawing code,
attempt to fix subsurf crash... didnt work yet!
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_customdata.h
branches/blender2.5/blender/source/blender/blenkernel/BKE_modifier.h
branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.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/subsurf_ccg.c
branches/blender2.5/blender/source/blender/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/blender2.5/blender/source/blender/editors/transform/transform_conversions.c
branches/blender2.5/blender/source/blender/makesdna/DNA_view3d_types.h
Modified:
branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h
2009-01-07 13:10:31 UTC (rev 18396)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_DerivedMesh.h
2009-01-07 14:46:50 UTC (rev 18397)
@@ -459,9 +459,6 @@
void weight_to_rgb(float input, float *fr, float *fg, float *fb);
-/* determines required DerivedMesh data according to view and edit modes */
-CustomDataMask get_viewedit_datamask();
-
/* convert layers requested by a GLSL material to actually available layers in
* the DerivedMesh, with both a pointer for arrays and an offset for editmesh
*/
typedef struct DMVertexAttribs {
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_customdata.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_customdata.h
2009-01-07 13:10:31 UTC (rev 18396)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_customdata.h
2009-01-07 14:46:50 UTC (rev 18397)
@@ -32,11 +32,9 @@
#ifndef BKE_CUSTOMDATA_H
#define BKE_CUSTOMDATA_H
-#include "BLO_sys_types.h" // for intptr_t support
-
struct CustomData;
struct CustomDataLayer;
-typedef intptr_t CustomDataMask;
+typedef unsigned int CustomDataMask;
extern const CustomDataMask CD_MASK_BAREMESH;
extern const CustomDataMask CD_MASK_MESH;
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_modifier.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_modifier.h
2009-01-07 13:10:31 UTC (rev 18396)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_modifier.h
2009-01-07 14:46:50 UTC (rev 18397)
@@ -291,7 +291,7 @@
struct Object *modifiers_isDeformedByArmature(struct Object *ob);
struct Object *modifiers_isDeformedByLattice(struct Object *ob);
int modifiers_usesArmature(struct Object *ob, struct bArmature *arm);
-int modifiers_isDeformed(struct Object *ob);
+int modifiers_isDeformed(struct Scene *scene, struct Object *ob);
void modifier_freeTemporaryData(struct ModifierData *md);
int modifiers_indexInObject(struct Object *ob, struct ModifierData
*md);
Modified:
branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
2009-01-07 13:10:31 UTC (rev 18396)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/DerivedMesh.c
2009-01-07 14:46:50 UTC (rev 18397)
@@ -1412,47 +1412,6 @@
return dm;
}
-CustomDataMask get_viewedit_datamask()
-{
-#if 0
- XXX
- CustomDataMask mask = CD_MASK_BAREMESH;
- ScrArea *sa;
- /* check if we need tfaces & mcols due to face select or texture paint
*/
- if(FACESEL_PAINT_TEST || G.f & G_TEXTUREPAINT)
- mask |= CD_MASK_MTFACE | CD_MASK_MCOL;
-
- /* check if we need tfaces & mcols due to view mode */
- for(sa = G.curscreen->areabase.first; sa; sa = sa->next) {
- if(sa->spacetype == SPACE_VIEW3D) {
- View3D *view = sa->spacedata.first;
- if(view->drawtype == OB_SHADED) {
- /* this includes normals for
mesh_create_shadedColors */
- mask |= CD_MASK_
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18398] branches/blender2.5/blender/source /blender/makesrna/intern/CMakeLists.txt: Fixed cmake for pose rna
Revision: 18398 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18398 Author: nicholasbishop Date: 2009-01-07 16:04:13 +0100 (Wed, 07 Jan 2009) Log Message: --- Fixed cmake for pose rna Modified Paths: -- branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt Modified: branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt === --- branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt 2009-01-07 14:46:50 UTC (rev 18397) +++ branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt 2009-01-07 15:04:13 UTC (rev 18398) @@ -55,6 +55,7 @@ rna_object_force.c rna_packedfile.c rna_particle.c + rna_pose.c rna_property.c rna_radio.c rna_rna.c ___ 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 [18399] branches: move code out of branch before rebranching
Revision: 18399 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18399 Author: joeedh Date: 2009-01-07 16:10:44 +0100 (Wed, 07 Jan 2009) Log Message: --- move code out of branch before rebranching Added Paths: --- branches/bmesh_tmp/ Removed Paths: - branches/bmesh/bmesh/ Copied: branches/bmesh_tmp (from rev 18398, branches/bmesh/bmesh) ___ 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 [18402] branches: move back new api code
Revision: 18402 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18402 Author: joeedh Date: 2009-01-07 16:17:58 +0100 (Wed, 07 Jan 2009) Log Message: --- move back new api code Added Paths: --- branches/bmesh/blender/source/blender/bmesh/ Removed Paths: - branches/bmesh_tmp/ Copied: branches/bmesh/blender/source/blender/bmesh (from rev 18401, branches/bmesh_tmp) ___ 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 [18403] branches/blender2.5/blender/source /blender: 2.5
Revision: 18403
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18403
Author: ton
Date: 2009-01-07 17:05:55 +0100 (Wed, 07 Jan 2009)
Log Message:
---
2.5
More globals discovered; lattice deform stored static
deform array and a matrix. Tsk!
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_lattice.h
branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
branches/blender2.5/blender/source/blender/blenkernel/intern/lattice.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.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/editors/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/makesdna/DNA_lattice_types.h
branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_lattice.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_lattice.h
2009-01-07 15:17:58 UTC (rev 18402)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_lattice.h
2009-01-07 16:05:55 UTC (rev 18403)
@@ -47,9 +47,11 @@
void free_lattice(struct Lattice *lt);
void make_local_lattice(struct Lattice *lt);
void calc_lat_fudu(int flag, int res, float *fu, float *du);
+
void init_latt_deform(struct Object *oblatt, struct Object *ob);
-void calc_latt_deform(float *co, float weight);
-void end_latt_deform(void);
+void calc_latt_deform(struct Object *, float *co, float weight);
+void end_latt_deform(struct Object *);
+
int object_deform_mball(struct Object *ob);
void outside_lattice(struct Lattice *lt);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
2009-01-07 15:17:58 UTC (rev 18402)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
2009-01-07 16:05:55 UTC (rev 18403)
@@ -946,8 +946,8 @@
MEM_freeN(obcopylist);
if(psys->lattice) {
- end_latt_deform();
- psys->lattice = 0;
+ end_latt_deform(psys->lattice);
+ psys->lattice = NULL;
}
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/lattice.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/lattice.c
2009-01-07 15:17:58 UTC (rev 18402)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/lattice.c
2009-01-07 16:05:55 UTC (rev 18403)
@@ -74,7 +74,6 @@
//XXX #include "BIF_editdeform.h"
Lattice *editLatt=0;
-static float *latticedata=0, latmat[4][4];
void calc_lat_fudu(int flag, int res, float *fu, float *du)
{
@@ -303,23 +302,23 @@
if(lt->editlatt) lt= lt->editlatt;
bp = lt->def;
- fp= latticedata=
MEM_mallocN(sizeof(float)*3*lt->pntsu*lt->pntsv*lt->pntsw, "latticedata");
+ fp= lt->latticedata=
MEM_mallocN(sizeof(float)*3*lt->pntsu*lt->pntsv*lt->pntsw, "latticedata");
/* for example with a particle system: ob==0 */
- if(ob==0) {
+ if(ob==NULL) {
/* in deformspace, calc matrix */
- Mat4Invert(latmat, oblatt->obmat);
+ Mat4Invert(lt->latmat, oblatt->obmat);
/* back: put in deform array */
- Mat4Invert(imat, latmat);
+ Mat4Invert(imat, lt->latmat);
}
else {
/* in deformspace, calc matrix */
Mat4Invert(imat, oblatt->obmat);
- Mat4MulMat4(latmat, ob->obmat, imat);
+ Mat4MulMat4(lt->latmat, ob->obmat, imat);
/* back: put in deform array */
- Mat4Invert(imat, latmat);
+ Mat4Invert(imat, lt->latmat);
}
for(w=0,fw=lt->fw; wpntsw; w++,fw+=lt->dw) {
@@ -341,19 +340,20 @@
}
}
-void calc_latt_deform(float *co, float weight)
+void calc_latt_deform(Object *ob, float *co, float weight)
{
- Lattice *lt;
+ Lattice *lt= ob->data;
float u, v, w, tu[4], tv[4], tw[4];
float *fpw, *fpv, *fpu, vec[3];
int ui, vi, wi, uu, vv, ww;
- if(latticedata==0) return;
+ if(lt->editlatt) lt= lt->editlatt;
+ if(lt->latticedata==NULL) return;
/* co is in local coords, treat with latmat */
VECCOPY(vec, co);
- Mat4MulVecfl(latmat, vec);
+ Mat4MulVecfl(lt->latmat, vec);
/* u v w coords */
@@ -395,10 +395,10 @@
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18404] branches/blender2.5/blender/source /blender/editors/space_node/node_select.c: 2.5
Revision: 18404 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18404 Author: theeth Date: 2009-01-07 17:49:11 +0100 (Wed, 07 Jan 2009) Log Message: --- 2.5 Add missing notifiers to node select, for proper redraw with multiple node windows. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_node/node_select.c Modified: branches/blender2.5/blender/source/blender/editors/space_node/node_select.c === --- branches/blender2.5/blender/source/blender/editors/space_node/node_select.c 2009-01-07 16:05:55 UTC (rev 18403) +++ branches/blender2.5/blender/source/blender/editors/space_node/node_select.c 2009-01-07 16:49:11 UTC (rev 18404) @@ -99,7 +99,6 @@ ;// node_link_viewer(snode, node); //std_rmouse_transform(node_transform_ext); /* does undo push for select */ - ED_region_tag_redraw(ar); } } @@ -121,6 +120,9 @@ node_mouse_select(snode, ar, mval, extend); break; } + + WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL); /* Do we need to pass the scene? */ + return OPERATOR_FINISHED; } @@ -227,6 +229,8 @@ } } + WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL); /* Do we need to pass the scene? */ + return OPERATOR_FINISHED; } ___ 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 [18405] branches/blender2.5/blender/source /blender/editors/transform: 2.5
Revision: 18405
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18405
Author: theeth
Date: 2009-01-07 17:52:18 +0100 (Wed, 07 Jan 2009)
Log Message:
---
2.5
Add notifiers to transform to insure all windows of the correct type are
redrawn.
Modified Paths:
--
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_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-07 16:49:11 UTC (rev 18404)
+++ branches/blender2.5/blender/source/blender/editors/transform/transform.c
2009-01-07 16:52:18 UTC (rev 18405)
@@ -101,6 +101,7 @@
#include "ED_util.h"
#include "UI_view2d.h"
#include "WM_types.h"
+#include "WM_api.h"
#include "BLI_arithb.h"
#include "BLI_blenlib.h"
@@ -329,13 +330,12 @@
#endif
}
-static void viewRedrawForce(TransInfo *t)
+static void viewRedrawForce(bContext *C, TransInfo *t)
{
if (t->spacetype == SPACE_VIEW3D)
{
- // TRANSFORM_FIX_ME
- // need to redraw ALL 3d view
- ED_area_tag_redraw(t->sa);
+ /* Do we need more refined tags? */
+ WM_event_add_notifier(C, NC_OBJECT|ND_TRANSFORM, NULL);
}
else if (t->spacetype == SPACE_ACTION) {
SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
@@ -347,8 +347,10 @@
else
ED_area_tag_redraw(t->sa);
}
- else if(t->spacetype == SPACE_NODE) {
- ED_area_tag_redraw(t->sa);
+ else if(t->spacetype == SPACE_NODE)
+ {
+ //ED_area_tag_redraw(t->sa);
+ WM_event_add_notifier(C, NC_SCENE|ND_NODES, NULL);
}
#if 0 // TRANSFORM_FIX_ME
else if (t->spacetype==SPACE_IMAGE) {
@@ -1101,7 +1103,7 @@
}
-void transformApply(TransInfo *t)
+void transformApply(bContext *C, TransInfo *t)
{
if (t->redraw)
{
@@ -,6 +1113,7 @@
selectConstraint(t);
if (t->transform) {
t->transform(t, t->mval); // calls recalcData()
+ viewRedrawForce(C, t);
}
t->redraw = 0;
}
@@ -1140,6 +1143,7 @@
{
exit_code = OPERATOR_CANCELLED;
restoreTransObjects(t); // calls recalcData()
+ viewRedrawForce(C, t);
}
else
{
@@ -1850,8 +1854,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
helpline(t, gcursor);
return 1;
@@ -1974,8 +1976,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
helpline (t, t->center);
return 1;
@@ -2247,8 +2247,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
if(!(t->flag & T_USES_MANIPULATOR)) helpline (t, t->center);
return 1;
@@ -2340,8 +2338,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
return 1;
}
@@ -2656,8 +2652,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
if(!(t->flag & T_USES_MANIPULATOR)) helpline (t, t->center);
return 1;
@@ -2765,8 +2759,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
if(!(t->flag & T_USES_MANIPULATOR)) helpline (t, t->center);
return 1;
@@ -2959,8 +2951,6 @@
recalcData(t);
ED_area_headerprint(t->sa, str);
-
- viewRedrawForce(t);
drawSnapping(t);
@@ -3039,8 +3029,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
return 1;
}
@@ -3113,8 +3101,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
helpline (t, t->center);
return 1;
@@ -3181,8 +3167,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
if(!(t->flag & T_USES_MANIPULATOR)) helpline (t, t->center);
return 1;
@@ -3272,8 +3256,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
return 1;
}
@@ -3387,8 +3369,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
return 1;
}
@@ -3460,8 +3440,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
-
helpline (t, t->center);
return 1;
@@ -3538,8 +3516,6 @@
ED_area_headerprint(t->sa, str);
- viewRedrawForce(t);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18406] branches/blender2.5/blender/source /blender: 2.5
Revision: 18406 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18406 Author: ton Date: 2009-01-07 18:25:17 +0100 (Wed, 07 Jan 2009) Log Message: --- 2.5 More files back in the 2.5 repo: (Note, boolean stuff moved to blenkernel) Modified Paths: -- branches/blender2.5/blender/source/blender/blenkernel/BKE_booleanops.h branches/blender2.5/blender/source/blender/blenkernel/SConscript branches/blender2.5/blender/source/blender/blenkernel/intern/Makefile Added Paths: --- branches/blender2.5/blender/source/blender/blenkernel/intern/booleanops.c branches/blender2.5/blender/source/blender/blenkernel/intern/booleanops_mesh.c branches/blender2.5/blender/source/blender/editors/interface/keyval.c branches/blender2.5/blender/source/blender/editors/screen/screendump.c Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_booleanops.h === --- branches/blender2.5/blender/source/blender/blenkernel/BKE_booleanops.h 2009-01-07 16:52:18 UTC (rev 18405) +++ branches/blender2.5/blender/source/blender/blenkernel/BKE_booleanops.h 2009-01-07 17:25:17 UTC (rev 18406) @@ -17,7 +17,7 @@ * 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) 2001-2002 by NaN Holding BV. + * The Original Code is Copyright (C) Blender Foundation. * All rights reserved. * * The Original Code is: all of this file. @@ -29,6 +29,7 @@ #ifndef BKE_BOOLEANOPS_H #define BKE_BOOLEANOPS_H +struct Scene; struct Object; struct Base; struct DerivedMesh; @@ -36,7 +37,7 @@ /* Performs a boolean between two mesh objects, it is assumed that both objects are in fact a mesh object. On success returns 1 and creates a new mesh object into blender data structures. On failure returns 0 and reports an error. */ -int NewBooleanMesh(struct Base *base, struct Base *base_select, int op); +int NewBooleanMesh(struct Scene *scene, struct Base *base, struct Base *base_select, int op); /* Performs a boolean between two mesh objects, it is assumed that both objects Modified: branches/blender2.5/blender/source/blender/blenkernel/SConscript === --- branches/blender2.5/blender/source/blender/blenkernel/SConscript 2009-01-07 16:52:18 UTC (rev 18405) +++ branches/blender2.5/blender/source/blender/blenkernel/SConscript 2009-01-07 17:25:17 UTC (rev 18406) @@ -9,7 +9,7 @@ incs += ' #/intern/iksolver/extern ../blenloader' incs += ' #/extern/bullet2/src' incs += ' #/intern/bmfont' -incs += ' #/intern/opennl/extern' +incs += ' #/intern/opennl/extern #/intern/bsp/extern' incs += ' ../gpu #/extern/glew/include' incs += ' ' + env['BF_OPENGL_INC'] Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/Makefile === --- branches/blender2.5/blender/source/blender/blenkernel/intern/Makefile 2009-01-07 16:52:18 UTC (rev 18405) +++ branches/blender2.5/blender/source/blender/blenkernel/intern/Makefile 2009-01-07 17:25:17 UTC (rev 18406) @@ -69,6 +69,7 @@ CPPFLAGS += -I$(NAN_DECIMATION)/include CPPFLAGS += -I$(NAN_ELBEEM)/include CPPFLAGS += -I$(NAN_OPENNL)/include +CPPFLAGS += -I$(NAN_BSP)/include # path to zlib CPPFLAGS += -I$(NAN_ZLIB)/include Copied: branches/blender2.5/blender/source/blender/blenkernel/intern/booleanops.c (from rev 18405, trunk/blender/source/blender/src/booleanops.c) === --- branches/blender2.5/blender/source/blender/blenkernel/intern/booleanops.c (rev 0) +++ branches/blender2.5/blender/source/blender/blenkernel/intern/booleanops.c 2009-01-07 17:25:17 UTC (rev 18406) @@ -0,0 +1,567 @@ +/** + * $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) Blender Foundation + * All rights reserved. + * + * The Original Code is: all of this file. + * + * Contributor(s): none yet. + * + * * END GPL LI
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18407] branches/blender2.5/blender/source /blender/blenkernel/intern/object.c: Fixed subsurf crash reported by mfoxdogg, was caused by not using an
Revision: 18407
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18407
Author: nicholasbishop
Date: 2009-01-07 19:03:12 +0100 (Wed, 07 Jan 2009)
Log Message:
---
Fixed subsurf crash reported by mfoxdogg, was caused by not using an
editmesh for derivedmeshes when in editmode.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
2009-01-07 17:25:17 UTC (rev 18406)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
2009-01-07 18:03:12 UTC (rev 18407)
@@ -2273,7 +2273,7 @@
/* includes all keys and modifiers */
if(ob->type==OB_MESH) {
- makeDerivedMesh(scene, ob, NULL,
CD_MASK_BAREMESH); // here was vieweditdatamask? XXX
+ makeDerivedMesh(scene, ob,
((Mesh*)ob->data)->edit_mesh, CD_MASK_BAREMESH); // here was
vieweditdatamask? XXX
}
else if(ob->type==OB_MBALL) {
makeDispListMBall(scene, ob);
___
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 [18408] branches/blender2.5/blender/ projectfiles_vc9/blender: 2.5 MSVC9 projectfiles
Revision: 18408 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18408 Author: elubie Date: 2009-01-07 19:04:14 +0100 (Wed, 07 Jan 2009) Log Message: --- 2.5 MSVC9 projectfiles updates: - booleanops.c and booleanops_mesh in blenkernel - screendump.c in editors/screen - keyval.c in editors/interface - RNA: rna_pose.c Modified Paths: -- branches/blender2.5/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj branches/blender2.5/blender/projectfiles_vc9/blender/makesrna/RNA_makesrna.vcproj Modified: branches/blender2.5/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj === --- branches/blender2.5/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj 2009-01-07 18:03:12 UTC (rev 18407) +++ branches/blender2.5/blender/projectfiles_vc9/blender/blenkernel/BKE_blenkernel.vcproj 2009-01-07 18:04:14 UTC (rev 18408) @@ -518,6 +518,14 @@ > + + + + Modified: branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj === --- branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-01-07 18:03:12 UTC (rev 18407) +++ branches/blender2.5/blender/projectfiles_vc9/blender/editors/ED_editors.vcproj 2009-01-07 18:04:14 UTC (rev 18408) @@ -343,6 +343,10 @@ > + + @@ -478,6 +482,10 @@ RelativePath="..\..\..\source\blender\editors\screen\screen_ops.c" > + + + + ___ 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 [18409] branches/blender2.5/blender/source /blender/editors: 2.5
Revision: 18409
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18409
Author: ton
Date: 2009-01-07 20:23:22 +0100 (Wed, 07 Jan 2009)
Log Message:
---
2.5
Two more files, vpaint.c and editdeform.c
No functionality working related to this yet, tomorrow!
(Added editdeform.c in mesh after all, it's doing hardly no lattice
stuff, and it seems out of place in anim_api)
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
Added Paths:
---
branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
branches/blender2.5/blender/source/blender/editors/space_view3d/vpaint.c
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
===
--- branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
2009-01-07 18:04:14 UTC (rev 18408)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
2009-01-07 19:23:22 UTC (rev 18409)
@@ -38,6 +38,9 @@
struct wmWindowManager;
struct EditSelection;
struct ViewContext;
+struct bDeformGroup;
+struct MDeformWeight;
+struct MDeformVert;
// edge and face flag both
#define EM_FGON2
@@ -64,6 +67,7 @@
intptr_t mesh_octree_table(Object *ob, struct EditMesh *em, float *co,
char mode);
struct EditVert *editmesh_get_x_mirror_vert(Object *ob, struct EditMesh *em,
float *co);
+intmesh_get_x_mirror_vert(Object *ob, int index);
/* mesh_ops.c */
void ED_operatortypes_mesh(void);
@@ -119,6 +123,20 @@
intEM_init_backbuf_border(struct ViewContext *vc, short
xmin, short ymin, short xmax, short ymax);
intEM_init_backbuf_circle(struct ViewContext *vc, short
xs, short ys, short rads);
+/* editdeform.c XXX rename functions? */
+#define WEIGHT_REPLACE 1
+#define WEIGHT_ADD 2
+#define WEIGHT_SUBTRACT 3
+
+void add_defgroup (Object *ob);
+void remove_vert_defgroup (Object *ob, struct bDeformGroup *dg,
int vertnum);
+void remove_verts_defgroup (Object *obedit, int allverts);
+struct bDeformGroup *add_defgroup_name (Object *ob, char *name);
+struct MDeformWeight *verify_defweight (struct MDeformVert *dv, int defgroup);
+struct MDeformWeight *get_defweight (struct MDeformVert *dv, int defgroup);
+bDeformGroup *add_defgroup_name (Object *ob, char *name);
+
+
#endif /* ED_MESH_H */
Copied: branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
(from rev 18408, trunk/blender/source/blender/src/editdeform.c)
===
--- branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
(rev 0)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
2009-01-07 19:23:22 UTC (rev 18409)
@@ -0,0 +1,1063 @@
+/**
+ * $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) 2001-2002 by NaN Holding BV.
+ * All rights reserved.
+ *
+ * The Original Code is: all of this file.
+ *
+ * Contributor(s): none yet.
+ *
+ * * END GPL LICENSE BLOCK *
+ * Creator-specific support for vertex deformation groups
+ * Added: apply deform function (ton)
+ */
+
+#include
+
+#include "MEM_guardedalloc.h"
+
+#include "DNA_cloth_types.h"
+#include "DNA_curve_types.h"
+#include "DNA_lattice_types.h"
+#include "DNA_mesh_types.h"
+#include "DNA_meshdata_types.h"
+#include "DNA_modifier_types.h"
+#include "DNA_object_types.h"
+#include "DNA_object_force.h"
+#include "DNA_scene_types.h"
+#include "DNA_particle_types.h"
+
+#include "BLI_blenlib.h"
+#include "BLI_editVert.h"
+
+#include "BKE_customdata.h"
+#include "BKE_DerivedMesh.h"
+#include "BKE_depsgraph.h"
+#include "BKE_deform.h"
+#include "BKE_displist.h"
+#include "BKE_global.h"
+#include "BKE_lattice.h"
+#include "BKE_mesh.h"
+#include "BKE_utildefines.h"
+
+#include "ED_mesh.h"
+#include "ED_view3d.h"
+#include "mesh_intern.h"
+
+/* XXX */
+static void BIF_undo_push() {}
+static void error() {}
+
+/*
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18410] branches/blender2.5/blender/source /blender/editors/armature/editarmature.c: 2.5
Revision: 18410
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18410
Author: jesterking
Date: 2009-01-07 21:40:27 +0100 (Wed, 07 Jan 2009)
Log Message:
---
2.5
- make sure source compiles (redefinition of functions)
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-01-07 19:23:22 UTC (rev 18409)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-01-07 20:40:27 UTC (rev 18410)
@@ -101,11 +101,9 @@
static void countall() {}
static void vertexgroup_select_by_name() {}
static void deselect_actionchannels() {}
-static void *add_defgroup_name() {return NULL;}
static void add_vert_to_defgroup() {}
#define WEIGHT_REPLACE 0
static void create_dverts() {}
-static void remove_vert_defgroup() {}
static int mesh_get_x_mirror_vert() {return 0;}
static void select_actionchannel_by_name() {}
/* * XXX *** */
___
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 [18411] branches/blender2.5/blender/source /blender: RNA
Revision: 18411
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18411
Author: blendix
Date: 2009-01-07 22:05:51 +0100 (Wed, 07 Jan 2009)
Log Message:
---
RNA
* DNA_userdef_types.h, done. Patch by Nathaniel Garbutt, thanks!
Modified Paths:
--
branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_constraint.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_text.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_userdef.c
Modified:
branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
===
--- branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
2009-01-07 20:40:27 UTC (rev 18410)
+++ branches/blender2.5/blender/source/blender/makesdna/DNA_userdef_types.h
2009-01-07 21:05:51 UTC (rev 18411)
@@ -331,5 +331,11 @@
#define GP_PAINT_DOSMOOTH (1<<0)
#define GP_PAINT_DOSIMPLIFY(1<<1)
+/* theme drawtypes */
+#define TH_MINIMAL 0
+#define TH_ROUNDSHADED 1
+#define TH_ROUNDED 2
+#define TH_OLDSKOOL3
+#define TH_SHADED 4
#endif
Modified: branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
===
--- branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2009-01-07 20:40:27 UTC (rev 18410)
+++ branches/blender2.5/blender/source/blender/makesrna/RNA_access.h
2009-01-07 21:05:51 UTC (rev 18411)
@@ -36,6 +36,8 @@
extern BlenderRNA BLENDER_RNA;
extern StructRNA RNA_Action;
+extern StructRNA RNA_ActionChannel;
+extern StructRNA RNA_ActionGroup;
extern StructRNA RNA_Actuator;
extern StructRNA RNA_ActuatorSensor;
extern StructRNA RNA_AlwaysSensor;
@@ -55,8 +57,8 @@
extern StructRNA RNA_Camera;
extern StructRNA RNA_CastModifier;
extern StructRNA RNA_CharInfo;
+extern StructRNA RNA_ClothCollisionSettings;
extern StructRNA RNA_ClothModifier;
-extern StructRNA RNA_ClothCollisionSettings;
extern StructRNA RNA_ClothSettings;
extern StructRNA RNA_CollectionProperty;
extern StructRNA RNA_CollisionModifier;
@@ -118,7 +120,6 @@
extern StructRNA RNA_LatticeModifier;
extern StructRNA RNA_LatticePoint;
extern StructRNA RNA_Library;
-extern StructRNA RNA_MappingTexture;
extern StructRNA RNA_MCol;
extern StructRNA RNA_MColLayer;
extern StructRNA RNA_MFloatProperty;
@@ -223,11 +224,30 @@
extern StructRNA RNA_TextLine;
extern StructRNA RNA_TextMarker;
extern StructRNA RNA_Texture;
+extern StructRNA RNA_TextureSlot;
+extern StructRNA RNA_Theme;
+extern StructRNA RNA_ThemeActionEditor;
+extern StructRNA RNA_ThemeAudioWindow;
+extern StructRNA RNA_ThemeBoneColorSet;
+extern StructRNA RNA_ThemeButtonsWindow;
+extern StructRNA RNA_ThemeFileBrowser;
+extern StructRNA RNA_ThemeImageEditor;
+extern StructRNA RNA_ThemeIpoEditor;
+extern StructRNA RNA_ThemeNLAEditor;
+extern StructRNA RNA_ThemeNodeEditor;
+extern StructRNA RNA_ThemeOutliner;
+extern StructRNA RNA_ThemeSequenceEditor;
+extern StructRNA RNA_ThemeTextEditor;
+extern StructRNA RNA_ThemeTimeline;
+extern StructRNA RNA_ThemeUserInterface;
+extern StructRNA RNA_ThemeUserPreferences;
+extern StructRNA RNA_ThemeView3D;
extern StructRNA RNA_TouchSensor;
extern StructRNA RNA_TransformSequence;
extern StructRNA RNA_UVProjectModifier;
extern StructRNA RNA_UnknownType;
extern StructRNA RNA_UserPreferences;
+extern StructRNA RNA_UserSolidLight;
extern StructRNA RNA_VectorFont;
extern StructRNA RNA_VertexGroup;
extern StructRNA RNA_WaveModifier;
Modified: branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
===
--- branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-01-07 20:40:27 UTC (rev 18410)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c
2009-01-07 21:05:51 UTC (rev 18411)
@@ -167,6 +167,15 @@
return mask;
}
+static int rna_color_quantize(PropertyRNA *prop, PropertyDefRNA *dp)
+{
+ if(prop->type == PROP_FLOAT && prop->subtype == PROP_COLOR)
+ if(strcmp(dp->dnatype, "float") != 0 && strcmp(dp->dnatype,
"double") != 0)
+ return 1;
+
+ return 0;
+}
+
static char *rna_def_property_get_func(FILE *f, StructRNA *srna, PropertyRNA
*prop, PropertyDefRNA *dp)
{
char *func;
@@ -212,6 +221,8 @@
else {
if(prop->type == PROP_BOOLEAN &&
dp->booleanbit)
fprintf(f, "return
(%s(data->%s[index] & %d) != 0);\n", (dp->booleannegative)? "!": "",
dp->dnan
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18412] branches/etch-a-ton/source/blender : adjust strokes by redrawing over them
Revision: 18412
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18412
Author: theeth
Date: 2009-01-07 22:46:10 +0100 (Wed, 07 Jan 2009)
Log Message:
---
adjust strokes by redrawing over them
(has to be turned on in the panel because it can give unexpected results
sometimes right now)
http://vimeo.com/2753749
http://blenderartists.org/~theeth/bf/etch-a-ton/adjust.ogv
Modified Paths:
--
branches/etch-a-ton/source/blender/makesdna/DNA_scene_types.h
branches/etch-a-ton/source/blender/src/drawview.c
branches/etch-a-ton/source/blender/src/editarmature_sketch.c
Modified: branches/etch-a-ton/source/blender/makesdna/DNA_scene_types.h
===
--- branches/etch-a-ton/source/blender/makesdna/DNA_scene_types.h
2009-01-07 21:05:51 UTC (rev 18411)
+++ branches/etch-a-ton/source/blender/makesdna/DNA_scene_types.h
2009-01-07 21:46:10 UTC (rev 18412)
@@ -881,6 +881,7 @@
/* toolsettings->bone_sketching */
#define BONE_SKETCHING 1
#define BONE_SKETCHING_QUICK 2
+#define BONE_SKETCHING_ADJUST 4
/* toolsettings->bone_sketching_convert */
#defineSK_CONVERT_CUT_FIXED1
Modified: branches/etch-a-ton/source/blender/src/drawview.c
===
--- branches/etch-a-ton/source/blender/src/drawview.c 2009-01-07 21:05:51 UTC
(rev 18411)
+++ branches/etch-a-ton/source/blender/src/drawview.c 2009-01-07 21:46:10 UTC
(rev 18412)
@@ -2312,7 +2312,8 @@
uiBlockBeginAlign(block);
/* use real flag instead of 1 */
- uiDefButBitC(block, TOG, BONE_SKETCHING, B_REDR, "Use Bone
Sketching", 10, yco, 180, 20, &G.scene->toolsettings->bone_sketching, 0, 0, 0,
0, "Use sketching to create and edit bones");
+ uiDefButBitC(block, TOG, BONE_SKETCHING, B_REDR, "Use Bone
Sketching", 10, yco, 160, 20, &G.scene->toolsettings->bone_sketching, 0, 0, 0,
0, "Use sketching to create and edit bones");
+ uiDefButBitC(block, TOG, BONE_SKETCHING_ADJUST, B_REDR, "A",
170, yco, 20, 20, &G.scene->toolsettings->bone_sketching, 0, 0, 0, 0, "Adjust
strokes by drawing near them");
uiDefButBitC(block, TOG, BONE_SKETCHING_QUICK, B_REDR, "Q",
190, yco, 20, 20, &G.scene->toolsettings->bone_sketching, 0, 0, 0, 0,
"Automatically convert and delete on stroke end");
yco -= 20;
Modified: branches/etch-a-ton/source/blender/src/editarmature_sketch.c
===
--- branches/etch-a-ton/source/blender/src/editarmature_sketch.c
2009-01-07 21:05:51 UTC (rev 18411)
+++ branches/etch-a-ton/source/blender/src/editarmature_sketch.c
2009-01-07 21:46:10 UTC (rev 18412)
@@ -92,6 +92,12 @@
int selected;
} SK_Stroke;
+typedef struct SK_Adjustment
+{
+ SK_Stroke *target;
+ int start, end;
+} SK_Adjustment;
+
#define SK_Stroke_BUFFER_INIT_SIZE 20
typedef struct SK_DrawData
@@ -118,6 +124,7 @@
SK_Stroke *active_stroke;
SK_Stroke *gesture;
SK_Pointnext_point;
+ SK_Adjustment adj;
} SK_Sketch;
typedef struct SK_StrokeIterator {
@@ -836,6 +843,26 @@
}
}
+void sk_growStrokeBufferN(SK_Stroke *stk, int n)
+{
+ if (stk->nb_points + n > stk->buf_size)
+ {
+ SK_Point *old_points = stk->points;
+
+ while (stk->nb_points + n > stk->buf_size)
+ {
+ stk->buf_size *= 2;
+ }
+
+ sk_allocStrokeBuffer(stk);
+
+ memcpy(stk->points, old_points, sizeof(SK_Point) *
stk->nb_points);
+
+ MEM_freeN(old_points);
+ }
+}
+
+
void sk_replaceStrokePoint(SK_Stroke *stk, SK_Point *pt, int n)
{
memcpy(stk->points + n, pt, sizeof(SK_Point));
@@ -863,6 +890,24 @@
stk->nb_points++;
}
+void sk_inserStrokePoints(SK_Stroke *stk, SK_Point *pts, int len, int start,
int end)
+{
+ int size = end - start + 1;
+
+ sk_growStrokeBufferN(stk, len - size);
+
+ if (len != size)
+ {
+ int tail_size = stk->nb_points - end + 1;
+
+ memmove(stk->points + start + len, stk->points + end + 1,
tail_size * sizeof(SK_Point));
+ }
+
+ memcpy(stk->points + start, pts, len * sizeof(SK_Point));
+
+ stk->nb_points += len - size;
+}
+
void sk_trimStroke(SK_Stroke *stk, int start, int end)
{
int size = end - start + 1;
@@ -1221,14 +1266,14 @@
}
}
-SK_Point *sk_snapPointStroke(SK_Stroke *stk, short mval[2], int *dist)
+SK_Point *sk_snapPointStroke(SK_Stroke *stk, short mval[2], int *dist, int
*index)
{
SK_Point *pt
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18413] branches/blender2.5/blender/source /blender/editors/armature: 2.5
Revision: 18413
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18413
Author: theeth
Date: 2009-01-08 01:24:59 +0100 (Thu, 08 Jan 2009)
Log Message:
---
2.5
Fix compile errors
Remove stubs that duplicate code and set armature lib priority correctly (needs
to link with mesh)
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/armature/SConscript
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
Modified: branches/blender2.5/blender/source/blender/editors/armature/SConscript
===
--- branches/blender2.5/blender/source/blender/editors/armature/SConscript
2009-01-07 21:46:10 UTC (rev 18412)
+++ branches/blender2.5/blender/source/blender/editors/armature/SConscript
2009-01-08 00:24:59 UTC (rev 18413)
@@ -8,4 +8,4 @@
incs += ' ../../render/extern/include #/intern/guardedalloc #intern/bmfont'
incs += ' ../../gpu ../../makesrna #/intern/opennl/extern'
-env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [],
libtype=['core'], priority=[100] )
+env.BlenderLib ( 'bf_editors_armature', sources, Split(incs), [],
libtype=['core'], priority=[44] )
Modified:
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-01-07 21:46:10 UTC (rev 18412)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
2009-01-08 00:24:59 UTC (rev 18413)
@@ -102,9 +102,7 @@
static void vertexgroup_select_by_name() {}
static void deselect_actionchannels() {}
static void add_vert_to_defgroup() {}
-#define WEIGHT_REPLACE 0
static void create_dverts() {}
-static int mesh_get_x_mirror_vert() {return 0;}
static void select_actionchannel_by_name() {}
/* * XXX *** */
___
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 [18414] branches/blender2.5/blender/source /blender/editors: 2.5
Revision: 18414
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18414
Author: mfoxdogg
Date: 2009-01-08 03:50:37 +0100 (Thu, 08 Jan 2009)
Log Message:
---
2.5
**
- Ported set/clear slow parents
- currently there is no keymap entries
- removed some unused functions and some tidying up
Modified Paths:
--
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/editors/object/object_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_view.c
Modified:
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
===
--- branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2009-01-08 00:24:59 UTC (rev 18413)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2009-01-08 02:50:37 UTC (rev 18414)
@@ -1639,36 +1639,78 @@
RNA_def_property_enum_items(prop, prop_set_restrictview_types);
}
-/* */
+/* * Slow Parent *** */
+static int object_set_slowparent_exec(bContext *C, wmOperator *op)
+{
+ Scene *scene= CTX_data_scene(C);
-void reset_slowparents(Scene *scene, View3D *v3d)
+ CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
+
+ if(base->object->parent) base->object->partype |= PARSLOW;
+ base->object->recalc |= OB_RECALC_OB;
+
+ }
+ CTX_DATA_END;
+
+ ED_anim_dag_flush_update(C);
+ ED_undo_push(C,"Set Slow Parent");
+
+ WM_event_add_notifier(C, NC_SCENE, CTX_data_scene(C));
+
+ return OPERATOR_FINISHED;
+}
+
+void OBJECT_OT_set_slowparent(wmOperatorType *ot)
{
- /* back to original locations */
- Base *base;
+
+ /* identifiers */
+ ot->name= "Set Slow Parent";
+ ot->idname= "OBJECT_OT_set_slow_parent";
+
+ /* api callbacks */
+ ot->invoke= WM_operator_confirm;
+ ot->exec= object_set_slowparent_exec;
+ ot->poll= ED_operator_view3d_active;
+}
- for(base= FIRSTBASE; base; base= base->next) {
+static int object_clear_slowparent_exec(bContext *C, wmOperator *op)
+{
+ Scene *scene= CTX_data_scene(C);
+
+ CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
if(base->object->parent) {
if(base->object->partype & PARSLOW) {
base->object->partype -= PARSLOW;
where_is_object(scene, base->object);
base->object->partype |= PARSLOW;
+ base->object->recalc |= OB_RECALC_OB;
}
}
+
}
+ CTX_DATA_END;
+
+ ED_anim_dag_flush_update(C);
+ ED_undo_push(C,"Clear Slow Parent");
+
+ WM_event_add_notifier(C, NC_SCENE, CTX_data_scene(C));
+
+ return OPERATOR_FINISHED;
}
-void set_slowparent(Scene *scene, View3D *v3d)
-{
- Base *base;
- if( okee("Set slow parent")==0 ) return;
-
- for(base= FIRSTBASE; base; base= base->next) {
- if(TESTBASELIB(v3d, base)) {
- if(base->object->parent) base->object->partype |=
PARSLOW;
- }
- }
- BIF_undo_push("Slow parent");
+void OBJECT_OT_clear_slowparent(wmOperatorType *ot)
+{
+
+ /* identifiers */
+ ot->name= "Clear Slow Parent";
+ ot->idname= "OBJECT_OT_clear_slow_parent";
+
+ /* api callbacks */
+ ot->invoke= WM_operator_confirm;
+ ot->exec= object_clear_slowparent_exec;
+ ot->poll= ED_operator_view3d_active;
}
+/* */
// XXX
#define BEZSELECTED_HIDDENHANDLES(bezt) ((G.f & G_HIDDENHANDLES) ?
(bezt)->f2 & SELECT : BEZSELECTED(bezt))
@@ -6308,55 +6350,3 @@
allqueue(REDRAWBUTSEDIT, 0);
}
}
-
-void hide_objects(Scene *scene, View3D *v3d, int select)
-{
- Base *base;
- short changed = 0, changed_act = 0;
- for(base = FIRSTBASE; base; base=base->next){
- if ((base->lay & v3d->lay) && TESTBASELIB(v3d, base)==select) {
- base->flag &= ~SELECT;
- base->object->flag = base->flag;
- base->object->restrictflag |= OB_RESTRICT_VIEW;
- changed = 1;
- if (base==BASACT) {
- BASACT= NULL;
- changed_act = 1;
- }
- }
- }
- if
