[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18495] branches/blender2.5/blender/source : 2.5
Revision: 18495
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18495
Author: ton
Date: 2009-01-14 13:26:45 +0100 (Wed, 14 Jan 2009)
Log Message:
---
2.5
Another one back: editcurve.c
- removed global editNurb everywhere
(cu-editnurb now has listbase with edit data)
- also added 'active bpoint' and 'active nurb' in
Curve struct
- editmode in/out works, mouse/border select works
Modified Paths:
--
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/include/ED_object.h
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/space_view3d/drawobject.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
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/transform/transform_generics.c
branches/blender2.5/blender/source/blender/editors/transform/transform_manipulator.c
branches/blender2.5/blender/source/blender/editors/transform/transform_orientations.c
branches/blender2.5/blender/source/blender/makesdna/DNA_curve_types.h
Added Paths:
---
branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
branches/blender2.5/blender/source/blender/editors/include/ED_curve.h
Modified: branches/blender2.5/blender/source/Makefile
===
--- branches/blender2.5/blender/source/Makefile 2009-01-14 03:02:44 UTC (rev
18494)
+++ branches/blender2.5/blender/source/Makefile 2009-01-14 12:26:45 UTC (rev
18495)
@@ -238,6 +238,7 @@
PULIB += $(OCGDIR)/blender/ed_view3d/libed_view3d.a
PULIB += $(OCGDIR)/blender/ed_interface/libed_interface.a
PULIB += $(OCGDIR)/blender/ed_object/libed_object.a
+PULIB += $(OCGDIR)/blender/ed_curve/libed_curve.a
PULIB += $(OCGDIR)/blender/ed_armature/libed_armature.a
PULIB += $(OCGDIR)/blender/ed_mesh/libed_mesh.a
PULIB += $(OCGDIR)/blender/ed_animation/libed_animation.a
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
2009-01-14 03:02:44 UTC (rev 18494)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
2009-01-14 12:26:45 UTC (rev 18495)
@@ -101,6 +101,12 @@
BLI_freelistN(cu-bev);
freedisplist(cu-disp);
+ if(cu-editnurb) {
+ freeNurblist(cu-editnurb);
+ MEM_freeN(cu-editnurb);
+ cu-editnurb= NULL;
+ }
+
unlink_curve(cu);
if(cu-mat) MEM_freeN(cu-mat);
Modified:
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2009-01-14 03:02:44 UTC (rev 18494)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
2009-01-14 12:26:45 UTC (rev 18495)
@@ -2490,6 +2490,7 @@
cu-bev.first=cu-bev.last= NULL;
cu-disp.first=cu-disp.last= NULL;
cu-editnurb= NULL;
+ cu-lastselbp= NULL;
cu-path= NULL;
cu-editstr= NULL;
Copied: branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
(from rev 18494, trunk/blender/source/blender/src/editcurve.c)
===
--- branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
(rev 0)
+++ branches/blender2.5/blender/source/blender/editors/curve/editcurve.c
2009-01-14 12:26:45 UTC (rev 18495)
@@ -0,0 +1,4712 @@
+/**
+ * $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
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18496] branches/blender2.5/blender/source /blender/blenkernel: 2.5
Revision: 18496
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18496
Author: ton
Date: 2009-01-14 14:04:48 +0100 (Wed, 14 Jan 2009)
Log Message:
---
2.5
Still some old editNurb here...
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
===
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
2009-01-14 12:26:45 UTC (rev 18495)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_curve.h
2009-01-14 13:04:48 UTC (rev 18496)
@@ -79,8 +79,8 @@
void calchandlesNurb( struct Nurb *nu);
void testhandlesNurb( struct Nurb *nu);
void autocalchandlesNurb( struct Nurb *nu, int flag);
-void autocalchandlesNurb_all(int flag);
-void sethandlesNurb(short code);
+void autocalchandlesNurb_all(ListBase *editnurb, int flag);
+void sethandlesNurb(ListBase *editnurb, short code);
void switchdirectionNurb( struct Nurb *nu);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
2009-01-14 12:26:45 UTC (rev 18495)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
2009-01-14 13:04:48 UTC (rev 18496)
@@ -68,9 +68,6 @@
/* globals */
-// XXX
-ListBase editNurb;
-
/* local */
int cu_isectLL(float *v1, float *v2, float *v3, float *v4,
short cox, short coy,
@@ -2315,18 +2312,18 @@
calchandlesNurb(nu);
}
-void autocalchandlesNurb_all(int flag)
+void autocalchandlesNurb_all(ListBase *editnurb, int flag)
{
Nurb *nu;
- nu= editNurb.first;
+ nu= editnurb-first;
while(nu) {
autocalchandlesNurb(nu, flag);
nu= nu-next;
}
}
-void sethandlesNurb(short code)
+void sethandlesNurb(ListBase *editnurb, short code)
{
/* code==1: set autohandle */
/* code==2: set vectorhandle */
@@ -2339,7 +2336,7 @@
short a, ok=0;
if(code==1 || code==2) {
- nu= editNurb.first;
+ nu= editnurb-first;
while(nu) {
if( (nu-type 7)==1) {
bezt= nu-bezt;
@@ -2363,7 +2360,7 @@
else {
/* there is 1 handle not FREE: FREE it all, else make ALIGNED
*/
- nu= editNurb.first;
+ nu= editnurb-first;
if (code == 5) {
ok = HD_ALIGN;
} else if (code == 6) {
@@ -2386,7 +2383,7 @@
if(ok) ok= HD_FREE;
else ok= HD_ALIGN;
}
- nu= editNurb.first;
+ nu= editnurb-first;
while(nu) {
if( (nu-type 7)==1) {
bezt= nu-bezt;
___
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 [18498] branches/blender2.5/blender/source /blender/editors/object/editkey.c: 2.5
Revision: 18498
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18498
Author: ton
Date: 2009-01-14 14:06:09 +0100 (Wed, 14 Jan 2009)
Log Message:
---
2.5
Still old editNurb here... last part
(I committed in parts, have gpencil restored here and can't
commit that yet!)
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/object/editkey.c
Modified: branches/blender2.5/blender/source/blender/editors/object/editkey.c
===
--- branches/blender2.5/blender/source/blender/editors/object/editkey.c
2009-01-14 13:05:10 UTC (rev 18497)
+++ branches/blender2.5/blender/source/blender/editors/object/editkey.c
2009-01-14 13:06:09 UTC (rev 18498)
@@ -77,9 +77,6 @@
static void error() {}
/* XXX */
-extern ListBase editNurb; /* in editcurve.c */
-
-
static void default_key_ipo(Scene *scene, Key *key)
{
IpoCurve *icu;
@@ -387,7 +384,7 @@
kb= add_keyblock(scene, key);
- if(editNurb.first) curve_to_key(cu, kb, editNurb);
+ if(cu-editnurb-first) curve_to_key(cu, kb, cu-editnurb);
else curve_to_key(cu, kb, cu-nurb);
}
___
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 [18500] branches/blender2.5/blender/source /blender: Moved some more sculpt data into operator properties, also the test brush is now properly created
Revision: 18500
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18500
Author: nicholasbishop
Date: 2009-01-14 16:29:29 +0100 (Wed, 14 Jan 2009)
Log Message:
---
Moved some more sculpt data into operator properties, also the test brush is
now properly created so you can edit its state in the RNA viewer. Added an RNA
property for the brush sculpt tool as well.
Modified Paths:
--
branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
2009-01-14 13:18:10 UTC (rev 18499)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
2009-01-14 15:29:29 UTC (rev 18500)
@@ -70,6 +70,7 @@
brush-rate= 0.1f;
brush-innerradius= 0.5f;
brush-clone.alpha= 0.5;
+ brush-sculpt_tool = SCULPT_TOOL_DRAW;
/* enable fake user by default */
brush-id.flag |= LIB_FAKEUSER;
Modified: branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
===
--- branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-14 13:18:10 UTC (rev 18499)
+++ branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-14 15:29:29 UTC (rev 18500)
@@ -124,13 +124,25 @@
float grab_delta[3];
} BrushActionSymm;
+typedef enum StrokeFlags {
+ CLIP_X = 1,
+ CLIP_Y = 2,
+ CLIP_Z = 4
+} StrokeFlags;
+
/* Cache stroke properties that don't change after
the initialization at the start of a stroke. Used because
- RNA property lookup isn't particularly fast. */
+ RNA property lookup isn't particularly fast.
+
+ For descriptions of these settings, check the operator properties.
+*/
typedef struct StrokeCache {
float radius;
float scale[3];
float flip;
+ int flag;
+ float clip_tolerance[3];
+ int mouse[2];
} StrokeCache;
typedef struct BrushAction {
@@ -142,16 +154,11 @@
vec3f *mesh_store;
short (*orig_norms)[3];
- short mouse[2];
-
float prev_radius;
float radius;
float *layer_disps;
- char clip[3];
- float cliptol[3];
-
float anchored_rot;
/* Grab brush */
@@ -371,28 +378,28 @@
switch(sd-brush-sculpt_tool){
case SCULPT_TOOL_DRAW:
case SCULPT_TOOL_LAYER:
- return sd-brush-alpha / 5000.0f * dir * pressure * flip *
anchored; /*XXX: not sure why? multiplied by G.vd-grid */;
+ return sd-brush-alpha / 50.0f * dir * pressure * flip *
anchored; /*XXX: not sure why? multiplied by G.vd-grid */;
case SCULPT_TOOL_SMOOTH:
- return sd-brush-alpha / 50.0f * pressure * anchored;
+ return sd-brush-alpha / .5f * pressure * anchored;
case SCULPT_TOOL_PINCH:
- return sd-brush-alpha / 1000.0f * dir * pressure * flip *
anchored;
+ return sd-brush-alpha / 10.0f * dir * pressure * flip *
anchored;
case SCULPT_TOOL_GRAB:
return 1;
case SCULPT_TOOL_INFLATE:
- return sd-brush-alpha / 5000.0f * dir * pressure * flip *
anchored;
+ return sd-brush-alpha / 50.0f * dir * pressure * flip *
anchored;
case SCULPT_TOOL_FLATTEN:
- return sd-brush-alpha / 500.0f * pressure * anchored;
+ return sd-brush-alpha / 5.0f * pressure * anchored;
default:
return 0;
}
}
/* For clipping against a mirror modifier */
-void sculpt_clip(const BrushAction *a, float *co, const float val[3])
+void sculpt_clip(StrokeCache *cache, float *co, const float val[3])
{
char i;
for(i=0; i3; ++i) {
- if(a-clip[i] (fabs(co[i]) = a-cliptol[i]))
+ if((cache-flag (CLIP_X i)) (fabs(co[i]) =
cache-clip_tolerance[i]))
co[i]= 0.0f;
else
co[i]= val[i];
@@ -482,7 +489,7 @@
co[1]+area_normal[1]*node-Fade*ss-cache-scale[1],
co[2]+area_normal[2]*node-Fade*ss-cache-scale[2]};
- sculpt_clip(a, co, val);
+ sculpt_clip(ss-cache, co, val);
node= node-next;
}
@@ -546,7 +553,7 @@
const float val[3]= {co[0]+(avg.x-co[0])*node-Fade,
co[1]+(avg.y-co[1])*node-Fade,
co[2]+(avg.z-co[2])*node-Fade};
-
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18501] branches/blender2.5/blender/source : 2.5
Revision: 18501 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18501 Author: ton Date: 2009-01-14 17:13:50 +0100 (Wed, 14 Jan 2009) Log Message: --- 2.5 GPencil code back! Joshua will probably take this further. I've added XXX notes where fixes are required. Also note that ED_gpencil.h has all old exports, which is probably not needed, most can go to gpencil_intern.h Also added Makefile fixes for sculpt Modified Paths: -- branches/blender2.5/blender/source/Makefile branches/blender2.5/blender/source/blender/editors/Makefile branches/blender2.5/blender/source/blender/editors/SConscript branches/blender2.5/blender/source/blender/editors/include/ED_armature.h branches/blender2.5/blender/source/blender/editors/include/ED_view3d.h branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_draw.c branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_intern.h branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c Added Paths: --- branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c branches/blender2.5/blender/source/blender/editors/gpencil/gpencil.c branches/blender2.5/blender/source/blender/editors/gpencil/gpencil_intern.h branches/blender2.5/blender/source/blender/editors/include/ED_gpencil.h branches/blender2.5/blender/source/blender/editors/include/ED_sequencer.h branches/blender2.5/blender/source/blender/editors/sculpt/Makefile Modified: branches/blender2.5/blender/source/Makefile === --- branches/blender2.5/blender/source/Makefile 2009-01-14 15:29:29 UTC (rev 18500) +++ branches/blender2.5/blender/source/Makefile 2009-01-14 16:13:50 UTC (rev 18501) @@ -241,6 +241,7 @@ PULIB += $(OCGDIR)/blender/ed_curve/libed_curve.a 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_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/editors/Makefile === --- branches/blender2.5/blender/source/blender/editors/Makefile 2009-01-14 15:29:29 UTC (rev 18500) +++ branches/blender2.5/blender/source/blender/editors/Makefile 2009-01-14 16:13:50 UTC (rev 18501) @@ -29,6 +29,6 @@ # Bounces make to subdirectories. SOURCEDIR = source/blender/editors -DIRS = armature mesh animation object datafiles transform screen curve gpencil physics preview space_outliner space_time space_view3d interface util space_api space_ipo space_image space_node space_buttons space_info space_file space_sound space_action space_nla space_script space_text space_sequencer +DIRS = armature mesh animation object sculpt datafiles transform screen curve gpencil physics preview space_outliner space_time space_view3d interface util space_api space_ipo space_image space_node space_buttons space_info space_file space_sound space_action space_nla space_script space_text space_sequencer include nan_subdirs.mk Modified: branches/blender2.5/blender/source/blender/editors/SConscript === --- branches/blender2.5/blender/source/blender/editors/SConscript 2009-01-14 15:29:29 UTC (rev 18500) +++ branches/blender2.5/blender/source/blender/editors/SConscript 2009-01-14 16:13:50 UTC (rev 18501) @@ -11,7 +11,7 @@ 'mesh/SConscript', 'object/SConscript', 'curve/SConscript', - #'gpencil/SConscript', enable this when there is actually code in gpencil/ + 'gpencil/SConscript', #'physics/SConscript', enable this when there is actually code in physics/ #'preview/SConscript', enable this when there is actually code in preview/ 'space_buttons/SConscript', Copied: branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c (from rev 18495, trunk/blender/source/blender/src/drawgpencil.c) === --- branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c (rev 0) +++ branches/blender2.5/blender/source/blender/editors/gpencil/drawgpencil.c 2009-01-14 16:13:50 UTC (rev 18501) @@ -0,0 +1,1061 @@ +/** + * $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
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18502] branches/blender2.5/blender/source /blender/editors: 2.5
Revision: 18502
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18502
Author: ton
Date: 2009-01-14 17:37:52 +0100 (Wed, 14 Jan 2009)
Log Message:
---
2.5
A small round of warning cleanups; unused variables, missing
headers and some const types.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
branches/blender2.5/blender/source/blender/editors/include/ED_markers.h
branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_node/node_header.c
branches/blender2.5/blender/source/blender/editors/space_node/node_select.c
branches/blender2.5/blender/source/blender/editors/transform/transform_ops.c
Modified:
branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
===
--- branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/animation/anim_markers.c
2009-01-14 16:37:52 UTC (rev 18502)
@@ -567,7 +567,7 @@
}
}
-static int find_nearest_marker_time(ListBase *markers, float dx)
+int find_nearest_marker_time(ListBase *markers, float dx)
{
TimeMarker *marker, *nearest= NULL;
float dist, min_dist= 100;
Modified:
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
===
---
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
2009-01-14 16:13:50 UTC (rev 18501)
+++
branches/blender2.5/blender/source/blender/editors/gpencil/editaction_gpencil.c
2009-01-14 16:37:52 UTC (rev 18502)
@@ -58,9 +58,10 @@
#include PIL_time.h
#include ED_anim_api.h
+#include ED_gpencil.h
#include ED_keyframes_edit.h
#include ED_keyframes_draw.h
-#include ED_gpencil.h
+#include ED_markers.h
#include ED_util.h
#include ED_types.h
@@ -71,7 +72,6 @@
static void BIF_undo_push() {}
static void error() {}
static void *get_action_context() {return NULL;}
-static int find_nearest_marker_time() {return 1;}
/* XXX */
@@ -600,7 +600,7 @@
static short snap_gpf_nearmarker (bGPDframe *gpf, Scene *scene)
{
if (gpf-flag GP_FRAME_SELECT)
- gpf-framenum=
(int)find_nearest_marker_time((float)gpf-framenum);
+ gpf-framenum= (int)find_nearest_marker_time(scene-markers,
(float)gpf-framenum);
return 0;
}
Modified:
branches/blender2.5/blender/source/blender/editors/include/ED_markers.h
===
--- branches/blender2.5/blender/source/blender/editors/include/ED_markers.h
2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_markers.h
2009-01-14 16:37:52 UTC (rev 18502)
@@ -39,11 +39,13 @@
struct bContext;
void draw_markers_time(const struct bContext *C, int flag);
+int find_nearest_marker_time(ListBase *markers, float dx);
/* called in screen_ops.c:ED_operatortypes_screen() */
void ED_marker_operatortypes(void);
/* called in screen_ops.c:ED_keymap_screen() */
void ED_marker_keymap(struct wmWindowManager *wm);
+
#endif /* ED_MARKERS_H */
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-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c
2009-01-14 16:37:52 UTC (rev 18502)
@@ -39,11 +39,12 @@
#include BIF_gl.h
-#include ED_screen.h
+#include ED_anim_api.h
+#include ED_mesh.h
#include ED_object.h
-#include ED_mesh.h
#include ED_space_api.h
-#include ED_anim_api.h
+#include ED_screen.h
+#include ED_sculpt.h
ARegionType *ED_regiontype_from_id(SpaceType *st, int regionid)
Modified:
branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
===
--- branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
2009-01-14 16:13:50 UTC (rev 18501)
+++ branches/blender2.5/blender/source/blender/editors/space_ipo/ipo_draw.c
2009-01-14 16:37:52 UTC (rev 18502)
@@ -662,7 +662,7 @@
{
SpaceIpo *sipo= sa-spacedata.first;
//View2D *v2d= ar-v2d;
- EditIpo *ei;
+ // EditIpo *ei;
if(sipo-editipo) {
Modified:
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18504] branches/blender2.5/blender/source /blender/editors: 2.5
Revision: 18504
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18504
Author: ton
Date: 2009-01-14 17:54:36 +0100 (Wed, 14 Jan 2009)
Log Message:
---
2.5
Bugfix;
- do not set active base/object yourse, but use ED_base_object_activate
- view3d buttons was reading NULL pointer.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.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-14 16:40:11 UTC (rev 18503)
+++ branches/blender2.5/blender/source/blender/editors/object/object_edit.c
2009-01-14 16:54:36 UTC (rev 18504)
@@ -1620,9 +1620,8 @@
static int object_set_restrictview_exec(bContext *C, wmOperator *op)
{
Scene *scene= CTX_data_scene(C);
+ short changed = 0;
- short changed = 0, changed_act = 0;
-
CTX_DATA_BEGIN(C, Base*, base, visible_bases) {
if(RNA_enum_is_equal(op-ptr, type, SELECTED)){
if (base-flag SELECT){
@@ -1631,8 +1630,7 @@
base-object-restrictflag |= OB_RESTRICT_VIEW;
changed = 1;
if (base==BASACT) {
- BASACT= NULL;
- changed_act = 1;
+ ED_base_object_activate(C, NULL);
}
}
}
@@ -1652,9 +1650,6 @@
WM_event_add_notifier(C, NC_SCENE|ND_OB_SELECT,
CTX_data_scene(C));
- if (changed_act) { /* these spaces depend on the active object
*/
- WM_event_add_notifier(C, NC_SCENE|ND_OB_ACTIVE,
CTX_data_scene(C));
- }
}
return OPERATOR_FINISHED;
Modified:
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
===
---
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2009-01-14 16:40:11 UTC (rev 18503)
+++
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
2009-01-14 16:54:36 UTC (rev 18504)
@@ -5327,8 +5327,8 @@
Scene *scene= CTX_data_scene(C);
ScrArea *sa= CTX_wm_area(C);
View3D *v3d= sa-spacedata.first;
- Base *basact= scene-basact;
- Object *ob= basact-object;
+ Base *basact= CTX_data_active_base(C);
+ Object *ob= CTX_data_active_object(C);
Object *obedit = CTX_data_edit_object(C);
EditMesh *em= NULL;
int bit, ctrl=0, shift=0; // XXX shift arg?
___
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 [18505] branches/blender2.5/blender: Fixed warnings in sculpt, also brought back brush curve.
Revision: 18505
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18505
Author: nicholasbishop
Date: 2009-01-14 18:22:30 +0100 (Wed, 14 Jan 2009)
Log Message:
---
Fixed warnings in sculpt, also brought back brush curve.
Modified Paths:
--
branches/blender2.5/blender/CMakeLists.txt
branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
branches/blender2.5/blender/source/blender/editors/include/ED_sculpt.h
branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
branches/blender2.5/blender/source/blender/editors/sculpt/sculpt_intern.h
branches/blender2.5/blender/source/blender/editors/sculpt/stroke.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_intern.h
Modified: branches/blender2.5/blender/CMakeLists.txt
===
--- branches/blender2.5/blender/CMakeLists.txt 2009-01-14 16:54:36 UTC (rev
18504)
+++ branches/blender2.5/blender/CMakeLists.txt 2009-01-14 17:22:30 UTC (rev
18505)
@@ -197,7 +197,7 @@
SET(PLATFORM_LINKFLAGS -pthread)
# Better warnings
- SET(C_WARNINGS -Wall -Wno-char-subscripts -W -Wshadow -Wpointer-arith
-Wbad-function-cast -Wcast-qual -Wcast-align -Waggregate-return
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-Wnested-externs -Wredundant-decls)
+ SET(C_WARNINGS -Wall -Wno-char-subscripts -W -Wshadow -Wpointer-arith
-Wbad-function-cast -Wcast-qual -Wcast-align -Waggregate-return
-Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
-Wnested-externs -Wredundant-decls -Wdeclaration-after-statement)
INCLUDE_DIRECTORIES(/usr/include /usr/local/include)
ENDIF(UNIX)
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
===
--- branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
2009-01-14 16:54:36 UTC (rev 18504)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
2009-01-14 17:22:30 UTC (rev 18505)
@@ -72,6 +72,8 @@
brush-clone.alpha= 0.5;
brush-sculpt_tool = SCULPT_TOOL_DRAW;
+ brush_curve_preset(brush, BRUSH_PRESET_SHARP);
+
/* enable fake user by default */
brush-id.flag |= LIB_FAKEUSER;
brush_toggled_fake_user(brush);
@@ -222,8 +224,7 @@
}
}
-
-void sculpt_preset_curve(Brush *b, BrushCurvePreset preset)
+void brush_curve_preset(Brush *b, BrushCurvePreset preset)
{
CurveMap *cm = NULL;
Modified: branches/blender2.5/blender/source/blender/editors/include/ED_sculpt.h
===
--- branches/blender2.5/blender/source/blender/editors/include/ED_sculpt.h
2009-01-14 16:54:36 UTC (rev 18504)
+++ branches/blender2.5/blender/source/blender/editors/include/ED_sculpt.h
2009-01-14 17:22:30 UTC (rev 18505)
@@ -31,7 +31,7 @@
struct bContext;
struct wmWindowManager;
-void ED_operatortypes_sculpt();
+void ED_operatortypes_sculpt(void);
void ED_keymap_sculpt(wmWindowManager *wm);
#endif
Modified: branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
===
--- branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-14 16:54:36 UTC (rev 18504)
+++ branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-14 17:22:30 UTC (rev 18505)
@@ -53,6 +53,7 @@
#include DNA_userdef_types.h
#include DNA_color_types.h
+#include BKE_brush.h
#include BKE_context.h
#include BKE_customdata.h
#include BKE_DerivedMesh.h
@@ -184,19 +185,6 @@
static void init_brushaction(SculptData *sd, BrushAction *a, short *, short *);
-
-/* = MEMORY =
- *
- * Allocate/initialize/free data
- */
-
-static void sculpt_init_session(SculptData *sd)
-{
- if(sd-session)
- ;/*XXX: sculptsession_free(G.scene); */
- sd-session= MEM_callocN(sizeof(SculptSession), SculptSession);
-}
-
/* vertex_users is an array of Lists that store all the faces that use a
particular vertex. vertex_users is in the same order as mesh.mvert */
static void calc_vertex_users(SculptSession *ss)
@@ -252,31 +240,11 @@
* Simple functions to get data from the GL
*/
-/* Store the modelview and projection matrices and viewport. */
-void init_sculptmatrices()
-{
- /* XXX: probably becomes context data?
-
- SculptSession *ss= sculpt_session();
-
- glMatrixMode(GL_MODELVIEW);
- glPushMatrix();
- glMultMatrixf(OBACT-obmat);
-
- if(!ss-mats)
- ss-mats = MEM_callocN(sizeof(bglMats), sculpt bglmats);
- bgl_get_mats(ss-mats);
-
- glPopMatrix();
- */
-}
-
/* Uses window coordinates (x,y) to find the depth in the GL depth buffer. If
available, G.vd-depths is used so that the brush doesn't sculpt
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18506] branches/blender2.5/blender: Removed a second declaration for BLI_uniquename.
Revision: 18506 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18506 Author: nicholasbishop Date: 2009-01-14 18:36:13 +0100 (Wed, 14 Jan 2009) Log Message: --- Removed a second declaration for BLI_uniquename. Also supressed cmake/gcc warnings about unused parameters since these are everywhere (sometimes with good reason, for callbacks) Modified Paths: -- branches/blender2.5/blender/CMakeLists.txt branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h Modified: branches/blender2.5/blender/CMakeLists.txt === --- branches/blender2.5/blender/CMakeLists.txt 2009-01-14 17:22:30 UTC (rev 18505) +++ branches/blender2.5/blender/CMakeLists.txt 2009-01-14 17:36:13 UTC (rev 18506) @@ -197,7 +197,7 @@ SET(PLATFORM_LINKFLAGS -pthread) # Better warnings - SET(C_WARNINGS -Wall -Wno-char-subscripts -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wredundant-decls -Wdeclaration-after-statement) + SET(C_WARNINGS -Wall -Wno-char-subscripts -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wredundant-decls -Wdeclaration-after-statement -Wno-unused-parameter) INCLUDE_DIRECTORIES(/usr/include /usr/local/include) ENDIF(UNIX) Modified: branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h === --- branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h 2009-01-14 17:22:30 UTC (rev 18505) +++ branches/blender2.5/blender/source/blender/blenlib/BLI_listbase.h 2009-01-14 17:36:13 UTC (rev 18506) @@ -46,7 +46,6 @@ void BLI_freelistN(struct ListBase *listbase); void BLI_addtail(struct ListBase *listbase, void *vlink); void BLI_remlink(struct ListBase *listbase, void *vlink); -void BLI_uniquename(struct ListBase *list, void *vlink, char defname[], short name_offs, short len); void BLI_addhead(struct ListBase *listbase, void *vlink); void BLI_insertlinkbefore(struct ListBase *listbase, void *vnextlink, void *vnewlink); ___ 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 [18507] branches/blender2.5/blender/ CMakeLists.txt: Tweak the CMake warnings a bit.
Revision: 18507 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18507 Author: nicholasbishop Date: 2009-01-14 19:03:47 +0100 (Wed, 14 Jan 2009) Log Message: --- Tweak the CMake warnings a bit. For example, function declarations with no parameters being declared without void in the parameter list were throwing too many warnings to be useful. Same for implicit casting of function return values from one numeric type to another. Modified Paths: -- branches/blender2.5/blender/CMakeLists.txt Modified: branches/blender2.5/blender/CMakeLists.txt === --- branches/blender2.5/blender/CMakeLists.txt 2009-01-14 17:36:13 UTC (rev 18506) +++ branches/blender2.5/blender/CMakeLists.txt 2009-01-14 18:03:47 UTC (rev 18507) @@ -197,7 +197,7 @@ SET(PLATFORM_LINKFLAGS -pthread) # Better warnings - SET(C_WARNINGS -Wall -Wno-char-subscripts -W -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -Wredundant-decls -Wdeclaration-after-statement -Wno-unused-parameter) + SET(C_WARNINGS -Wall -Wextra -Wno-char-subscripts -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Waggregate-return -Wnested-externs -Wredundant-decls -Wdeclaration-after-statement -Wno-unused-parameter) INCLUDE_DIRECTORIES(/usr/include /usr/local/include) ENDIF(UNIX) ___ 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 [18508] branches/blender2.5/blender: Added missing sculpt/brush RNA properties.
Revision: 18508 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18508 Author: nicholasbishop Date: 2009-01-14 19:48:16 +0100 (Wed, 14 Jan 2009) Log Message: --- Added missing sculpt/brush RNA properties. Also a few more tweaks to CMake/gcc warnings. Modified Paths: -- branches/blender2.5/blender/CMakeLists.txt branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c Modified: branches/blender2.5/blender/CMakeLists.txt === --- branches/blender2.5/blender/CMakeLists.txt 2009-01-14 18:03:47 UTC (rev 18507) +++ branches/blender2.5/blender/CMakeLists.txt 2009-01-14 18:48:16 UTC (rev 18508) @@ -197,7 +197,7 @@ SET(PLATFORM_LINKFLAGS -pthread) # Better warnings - SET(C_WARNINGS -Wall -Wextra -Wno-char-subscripts -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Waggregate-return -Wnested-externs -Wredundant-decls -Wdeclaration-after-statement -Wno-unused-parameter) + SET(C_WARNINGS -Wall -Wno-char-subscripts -Wpointer-arith -Wcast-align -Waggregate-return -Wnested-externs -Wdeclaration-after-statement) INCLUDE_DIRECTORIES(/usr/include /usr/local/include) ENDIF(UNIX) Modified: branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c === --- branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c 2009-01-14 18:03:47 UTC (rev 18507) +++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c 2009-01-14 18:48:16 UTC (rev 18508) @@ -137,12 +137,27 @@ prop= RNA_def_property(srna, spacing_pressure, PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, flag, BRUSH_SPACING_PRESSURE); RNA_def_property_ui_text(prop, Spacing Pressure, Enable tablet pressure sensitivity for spacing.); + + prop= RNA_def_property(srna, rake, PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, flag, BRUSH_RAKE); + RNA_def_property_ui_text(prop, Rake, Rotate the brush texture to match the stroke direction.); + + prop= RNA_def_property(srna, anchored, PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, flag, BRUSH_RAKE); + RNA_def_property_ui_text(prop, Anchored, Keep the brush anchored to the initial location.); + + prop= RNA_def_property(srna, flip_direction, PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, flag, BRUSH_DIR_IN); + RNA_def_property_ui_text(prop, Flip Direction, Move vertices in the opposite direction.); /* not exposed in the interface yet prop= RNA_def_property(srna, fixed_tex, PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, flag, BRUSH_FIXED_TEX); RNA_def_property_ui_text(prop, Fixed Texture, Keep texture origin in fixed position.);*/ + prop= RNA_def_property(srna, curve, PROP_POINTER, PROP_NONE); + RNA_def_property_ui_text(prop, Curve, Editable falloff curve.); + /* texture */ rna_def_mtex_common(srna, rna_Brush_mtex_begin, rna_Brush_active_texture_get, TextureSlot); ___ 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 [18509] branches/blender2.5/blender/source /blender/editors: 2.5
Revision: 18509
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18509
Author: ton
Date: 2009-01-14 20:26:11 +0100 (Wed, 14 Jan 2009)
Log Message:
---
2.5
Editmesh: add primitive basics back. Had to clean up a load of
crap there... but it's sorta in control, so I think Shul can
pick it up again.
Test: ctrl+0 adds plane, or ctrl+9 adds grid.
Notes for Shul:
- i've added a transform function, which gets correctly passed
on to the add_prim function, should work for all object
transforms. Only the code inside add_prim might be needed
to check (it uses 4x4 mat now, not a 3x3)
- The old code with buttons has been ifdeffed out, check for
user input and make it rna properties, which get read
in the exec(), and handed over to the add_prim. Set them
default now to the values from old buttons.
- Operator naming is preferred lower case, I gave this
a new name.
- check a bit on formatting code, but don't use the old code
as example! Look also at ED_keymap_mesh() for example.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_lib.c
branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h
branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_header.c
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
===
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
2009-01-14 18:48:16 UTC (rev 18508)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh.c
2009-01-14 19:26:11 UTC (rev 18509)
@@ -1022,7 +1022,7 @@
ClothModifierData *clmd;
PTCacheID pid;
float *fp, *newkey, *oldkey, nor[3], cacheco[3], cachemat[4][4];
- int i, a, ototvert, totedge=0, cacheedit= 0;
+ int i, a, ototvert, cacheedit= 0;
/* this one also tests of edges are not in faces: */
/* eed-f2==0: not in face, f2==1: draw it */
@@ -1031,19 +1031,17 @@
/* eve-f2 : being used in vertexnormals */
edge_drawflags(em);
- eed= em-edges.first;
- while(eed) {
- totedge++;
- eed= eed-next;
- }
+ G.totvert= BLI_countlist(em-verts);
+ G.totedge= BLI_countlist(em-edges);
+ G.totface= BLI_countlist(em-faces);
/* new Vertex block */
if(G.totvert==0) mvert= NULL;
else mvert= MEM_callocN(G.totvert*sizeof(MVert), loadeditMesh vert);
/* new Edge block */
- if(totedge==0) medge= NULL;
- else medge= MEM_callocN(totedge*sizeof(MEdge), loadeditMesh edge);
+ if(G.totedge==0) medge= NULL;
+ else medge= MEM_callocN(G.totedge*sizeof(MEdge), loadeditMesh edge);
/* new Face block */
if(G.totface==0) mface= NULL;
@@ -1064,7 +1062,7 @@
/* add new custom data */
me-totvert= G.totvert;
- me-totedge= totedge;
+ me-totedge= G.totedge;
me-totface= G.totface;
CustomData_copy(em-vdata, me-vdata, CD_MASK_MESH, CD_CALLOC,
me-totvert);
@@ -2096,21 +2094,24 @@
int i;
if (forVert) {
- g_em_vert_array =
MEM_mallocN(sizeof(*g_em_vert_array)*G.totvert, em_v_arr);
+ int tot= BLI_countlist(em-verts);
+ g_em_vert_array = MEM_mallocN(sizeof(*g_em_vert_array)*tot,
em_v_arr);
for (i=0,eve=em-verts.first; eve; i++,eve=eve-next)
g_em_vert_array[i] = eve;
}
if (forEdge) {
- g_em_edge_array =
MEM_mallocN(sizeof(*g_em_edge_array)*G.totedge, em_e_arr);
+ int tot= BLI_countlist(em-edges);
+ g_em_edge_array = MEM_mallocN(sizeof(*g_em_edge_array)*tot,
em_e_arr);
for (i=0,eed=em-edges.first; eed; i++,eed=eed-next)
g_em_edge_array[i] = eed;
}
if (forFace) {
- g_em_face_array =
MEM_mallocN(sizeof(*g_em_face_array)*G.totface, em_f_arr);
+ int tot= BLI_countlist(em-faces);
+ g_em_face_array = MEM_mallocN(sizeof(*g_em_face_array)*tot,
em_f_arr);
for (i=0,efa=em-faces.first; efa; i++,efa=efa-next)
g_em_face_array[i] = efa;
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
===
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
2009-01-14 18:48:16 UTC (rev 18508)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
2009-01-14 19:26:11 UTC (rev 18509)
@@ -34,7 +34,6 @@
#include
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18510] trunk/blender/source: BGE patch 18065: gameobj mass writeable + setmass actuator.
Revision: 18510
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18510
Author: ben2610
Date: 2009-01-14 23:33:39 +0100 (Wed, 14 Jan 2009)
Log Message:
---
BGE patch 18065: gameobj mass writeable + setmass actuator. This patch allows
to change the mass of a dynamic or rigid body object during the game. Two
methods are available: in a Python script by setting the mass attribute of the
game object; by logic brick with the Edit Object-Dynamics-Set Mass actuator.
The mass can only be set on dynamic objects and must be a positive floating
point value.
Modified Paths:
--
trunk/blender/source/blender/makesdna/DNA_actuator_types.h
trunk/blender/source/blender/src/buttons_logic.c
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.cpp
trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_IPhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
trunk/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.cpp
trunk/blender/source/gameengine/Ketsji/KX_SumoPhysicsController.h
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
Modified: trunk/blender/source/blender/makesdna/DNA_actuator_types.h
===
--- trunk/blender/source/blender/makesdna/DNA_actuator_types.h 2009-01-14
19:26:11 UTC (rev 18509)
+++ trunk/blender/source/blender/makesdna/DNA_actuator_types.h 2009-01-14
22:33:39 UTC (rev 18510)
@@ -82,7 +82,7 @@
char name[32];
float linVelocity[3]; /* initial lin. velocity on creation */
float angVelocity[3]; /* initial ang. velocity on creation */
- float pad;
+ float mass;
short localflag; /* flag for the lin ang. vel: apply locally */
short dyn_operation;
} bEditObjectActuator;
Modified: trunk/blender/source/blender/src/buttons_logic.c
===
--- trunk/blender/source/blender/src/buttons_logic.c2009-01-14 19:26:11 UTC
(rev 18509)
+++ trunk/blender/source/blender/src/buttons_logic.c2009-01-14 22:33:39 UTC
(rev 18510)
@@ -2136,12 +2136,17 @@
uiDefButS(block, TOG, 0, 3D, xco+width-50, yco-44,
40, 19, eoa-flag, 0.0, 0.0, 0, 0, Enable 3D tracking);
}
else if(eoa-type==ACT_EDOB_DYNAMICS) {
- ysize= 48;
+ ysize= 69;
glRects(xco, yco-ysize, xco+width, yco);
uiEmboss((float)xco, (float)yco-ysize,
(float)xco+width, (float)yco, 1);
- str= Dynamic Operation %t|Restore Dynamics %x0|Suspend
Dynamics %x1|Enable Rigid Body %x2|Disable Rigid Body %x3;
+ str= Dynamic Operation %t|Restore Dynamics %x0|Suspend
Dynamics %x1|Enable Rigid Body %x2|Disable Rigid Body %x3|Set Mass %x4;
uiDefButS(block, MENU, B_REDR, str, xco+40,
yco-44, (width-80), 19, (eoa-dyn_operation), 0.0, 0.0, 0, 0, );
+ if(eoa-dyn_operation==4) {
+ uiDefButF(block, NUM, 0, ,xco+40,
yco-63, width-80, 19,
+eoa-mass, 0.0, 1.0, 10, 0,
+Mass for object.);
+ }
}
str= Edit Object %t|Add Object %x0|End Object %x1|Replace Mesh
%x2|Track to %x3|Dynamics %x4;
uiDefButS(block, MENU, B_REDR, str, xco+40, yco-24,
(width-80), 19, eoa-type, 0.0, 0.0, 0, 0, );
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2009-01-14 19:26:11 UTC (rev 18509)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2009-01-14 22:33:39 UTC (rev 18510)
@@ -661,7 +661,8 @@
{
KX_SCA_DynamicActuator*
tmpdynact
= new
KX_SCA_DynamicActuator(gameobj,
-
editobact-dyn_operation
+
editobact-dyn_operation,
+ editobact-mass
);
baseact = tmpdynact;
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18515] branches/blender2.5/blender/source /blender: UI: various changes
Revision: 18515
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18515
Author: blendix
Date: 2009-01-15 05:13:38 +0100 (Thu, 15 Jan 2009)
Log Message:
---
UI: various changes
* View2D to region now returns ints instead of shorts.
* Use Numpad instead of Pad in automatic keymap menu info.
* Menus can now use buttons other than BUTM and SEPR, in
particular TOG and ROW are now supported instead of flipping
bits manually.
* Added a simpler uiDefMenu* api for making menus now, and it
only supports Operator and RNA buttons at the moment, will be
used in next commit. Not sure how this will evolve .. makes
menu code look cleaner anyways.
* Ensure that interface code doesn't crash when getting unknown
Operators and RNA properties, and display their buttons grayed
out in that case.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/gpencil/gpencil.c
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
branches/blender2.5/blender/source/blender/editors/include/UI_resources.h
branches/blender2.5/blender/source/blender/editors/include/UI_view2d.h
branches/blender2.5/blender/source/blender/editors/interface/interface.c
branches/blender2.5/blender/source/blender/editors/interface/interface_draw.c
branches/blender2.5/blender/source/blender/editors/interface/interface_regions.c
branches/blender2.5/blender/source/blender/editors/interface/view2d.c
branches/blender2.5/blender/source/blender/editors/space_sequencer/sequencer_draw.c
branches/blender2.5/blender/source/blender/editors/space_time/time_header.c
branches/blender2.5/blender/source/blender/editors/transform/transform.c
branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_keymap.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_operators.c
Modified: branches/blender2.5/blender/source/blender/editors/gpencil/gpencil.c
===
--- branches/blender2.5/blender/source/blender/editors/gpencil/gpencil.c
2009-01-15 03:12:21 UTC (rev 18514)
+++ branches/blender2.5/blender/source/blender/editors/gpencil/gpencil.c
2009-01-15 04:13:38 UTC (rev 18515)
@@ -770,7 +770,8 @@
VecCopyf(p3d, pt-x);
}
else {
- short mval[2], mx, my;
+ short mval[2];
+ int mx, my;
float *fp= give_cursor(NULL, NULL); // XXX should be scene, v3d
float dvec[3];
@@ -778,15 +779,13 @@
if (gps-flag GP_STROKE_2DSPACE) {
// XXX
// View2D *v2d=
spacelink_get_view2d(curarea-spacedata.first);
- // UI_view2d_view_to_region(v2d, pt-x, pt-y, mval,
mval+1);
+ // UI_view2d_view_to_region(v2d, pt-x, pt-y, mx,
my);
}
else {
// XXX
- // mval[0]= (short)(pt-x / 1000 * curarea-winx);
- // mval[1]= (short)(pt-y / 1000 * curarea-winy);
+ // mx= (short)(pt-x / 1000 * curarea-winx);
+ // my= (short)(pt-y / 1000 * curarea-winy);
}
- mx= mval[0];
- my= mval[1];
/* convert screen coordinate to 3d coordinates
* - method taken from editview.c - mouse_cursor()
@@ -1551,7 +1550,7 @@
{
bGPDspoint *pt1, *pt2;
View3D *v3d= NULL;
- short x0=0, y0=0, x1=0, y1=0;
+ int x0=0, y0=0, x1=0, y1=0;
short xyval[2];
int i;
Modified:
branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
===
--- branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
2009-01-15 03:12:21 UTC (rev 18514)
+++ branches/blender2.5/blender/source/blender/editors/include/UI_interface.h
2009-01-15 04:13:38 UTC (rev 18515)
@@ -268,7 +268,7 @@
uiBut *uiDefButC(uiBlock *block, int type, int retval, char *str, short x1,
short y1, short x2, short y2, char *poin, float min, float max, float a1, float
a2, char *tip);
uiBut *uiDefButBitC(uiBlock *block, int type, int bit, int retval, char *str,
short x1, short y1, short x2, short y2, char *poin, float min, float max, float
a1, float a2, char *tip);
uiBut *uiDefButR(uiBlock *block, int type, int retval, char *str, short x1,
short y1, short x2, short y2, struct PointerRNA *ptr, const char *propname, int
index, float min, float max, float a1, float a2, char *tip);
-uiBut *uiDefButO(struct bContext *C, uiBlock *block, int type, char *opname,
int opcontext, char *str, short x1, short y1, short x2, short y2, char *tip);
+uiBut
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18516] branches/blender2.5/blender/source /blender: RNA
Revision: 18516 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18516 Author: blendix Date: 2009-01-15 05:22:23 +0100 (Thu, 15 Jan 2009) Log Message: --- RNA * Work around bScreen/Screen DNA name patching, so bScreen does not require manual callbacks to be written for properties. * Added SpaceLink and SpaceImage RNA. * Fix issue initializing ID property arrays with default values. DNA * Some DNA changes for space image. * And a fix for corrupt clone image pointer in reading brushes. Modified Paths: -- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h branches/blender2.5/blender/source/blender/makesrna/RNA_access.h branches/blender2.5/blender/source/blender/makesrna/intern/CMakeLists.txt branches/blender2.5/blender/source/blender/makesrna/intern/makesrna.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_access.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_internal.h branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_scene.c branches/blender2.5/blender/source/blender/makesrna/intern/rna_screen.c Added Paths: --- branches/blender2.5/blender/source/blender/makesrna/intern/rna_space.c Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c === --- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-01-15 04:13:38 UTC (rev 18515) +++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-01-15 04:22:23 UTC (rev 18516) @@ -1490,6 +1490,8 @@ if(mtex) mtex-tex= newlibadr_us(fd, brush-id.lib, mtex-tex); } + + brush-clone.image= newlibadr_us(fd, brush-id.lib, brush-clone.image); } } } @@ -5237,6 +5239,7 @@ break; } } + /* main region */ ar= MEM_callocN(sizeof(ARegion), area region from do_versions); 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-15 04:13:38 UTC (rev 18515) +++ branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h 2009-01-15 04:22:23 UTC (rev 18516) @@ -431,6 +431,8 @@ short uvcalc_mapdir; short uvcalc_mapalign; short uvcalc_flag; + short uv_flag, uv_selectmode; + short uv_pad[2]; /* Auto-IK */ short autoik_chainlen; @@ -838,6 +840,16 @@ #define UVCALC_NO_ASPECT_CORRECT 2 /* would call this UVCALC_ASPECT_CORRECT, except it should be default with old file */ #define UVCALC_TRANSFORM_CORRECT 4 /* adjust UV's while transforming to avoid distortion */ +/* toolsettings-uv_flag */ +#define UV_SYNC_SELECTION 1 +#define UV_SHOW_SAME_IMAGE 2 + +/* toolsettings-uv_selectmode */ +#define UV_SELECT_VERTEX 0 +#define UV_SELECT_EDGE 1 /* not implemented */ +#define UV_SELECT_FACE 2 +#define UV_SELECT_ISLAND 3 + /* toolsettings-edge_mode */ #define EDGE_MODE_SELECT 0 #define EDGE_MODE_TAG_SEAM 1 Modified: branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h === --- branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h 2009-01-15 04:13:38 UTC (rev 18515) +++ branches/blender2.5/blender/source/blender/makesdna/DNA_space_types.h 2009-01-15 04:22:23 UTC (rev 18516) @@ -222,30 +222,26 @@ SpaceLink *next, *prev; ListBase regionbase;/* storage of regions for inactive spaces */ int spacetype; - float blockscale; + float blockscale; short blockhandler[8]; - - View2D v2d; /* depricated, copied to region */ struct Image *image; struct ImageUser iuser; struct CurveMapping *cumap; - short mode, menunr; - short imanr; + short menunr, imanr, pad2; short curtile; /* the currently active tile of the image when tile is enabled, is kept in sync with the active faces tile */ int flag; - short selectmode; short imtypenr, lock; - short pin; - float zoom; + short pin, pad3; char dt_uv; /* UV draw type */ char sticky; /* sticky selection type */ char dt_uvstretch; -
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18517] branches/blender2.5/blender/source /blender: 2.5: Space Image ported back
Revision: 18517 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18517 Author: blendix Date: 2009-01-15 05:38:18 +0100 (Thu, 15 Jan 2009) Log Message: --- 2.5: Space Image ported back Organized as follows: uvedit/ uv editing related code uvedit_draw.c: drawing code uvedit_ops.c: operators, just a few done uvedit_unwrap_ops.c: will be operators for unwrapping uvedit_paramatrizer.c: lscm/abf/stretch/pack space_image/ space_image.c: registration and common getter/setters image_draw.c: drawing code, mostly functional image_panels.c: panels, all commented out image_render.c: render callbacks, non functional image_ops.c: operators, only view navigation done image_header.c: header, menus mostly done but missing buttons Notes: * Header menus consist only of Operator and RNA buttons, if they are not implemented they're displayed grayed out. Ideally the full header could work like this, but std_libbuttons looks problematic. * Started using view2d code more than the old code, but for now it still does own view2d management due to some very specific requirements that the image window has. The drawing code however is more clear hopefully, it only uses view2d, and there is no switching between 'p' and 'f' view2d's anymore, it is always 'f'. * In order to make uvedit operators more independent I move some image space settings to scene toolsettings, and the current image and its buffer is in the context. Especially sync selection and select mode belonged there anyway as this cannot work correct with different spaces having different settings anyway. * Image paint is not back yet, did not want to put that together with uvedit because there's really no code sharing.. perhaps vertex paint, image paint and sculpt would be good to have in one module to share brush code, partial redraw, etc better. Modified Paths: -- branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h branches/blender2.5/blender/source/blender/blenkernel/intern/context.c branches/blender2.5/blender/source/blender/editors/Makefile branches/blender2.5/blender/source/blender/editors/SConscript 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/include/ED_screen.h branches/blender2.5/blender/source/blender/editors/mesh/editface.c branches/blender2.5/blender/source/blender/editors/mesh/editmesh_lib.c branches/blender2.5/blender/source/blender/editors/mesh/mesh_intern.h branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c branches/blender2.5/blender/source/blender/editors/space_api/spacetypes.c branches/blender2.5/blender/source/blender/editors/space_image/Makefile branches/blender2.5/blender/source/blender/editors/space_image/SConscript branches/blender2.5/blender/source/blender/editors/space_image/image_intern.h branches/blender2.5/blender/source/blender/editors/space_image/space_image.c Added Paths: --- branches/blender2.5/blender/source/blender/editors/include/ED_uvedit.h branches/blender2.5/blender/source/blender/editors/space_image/image_draw.c branches/blender2.5/blender/source/blender/editors/space_image/image_header.c branches/blender2.5/blender/source/blender/editors/space_image/image_ops.c branches/blender2.5/blender/source/blender/editors/space_image/image_panels.c branches/blender2.5/blender/source/blender/editors/space_image/image_render.c branches/blender2.5/blender/source/blender/editors/uvedit/ branches/blender2.5/blender/source/blender/editors/uvedit/Makefile branches/blender2.5/blender/source/blender/editors/uvedit/SConscript branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_draw.c branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_intern.h branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_parametrizer.c branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_parametrizer.h branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c Removed Paths: - branches/blender2.5/blender/source/blender/editors/space_image/image_header.c Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h === --- branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h 2009-01-15 04:22:23 UTC (rev 18516) +++ branches/blender2.5/blender/source/blender/blenkernel/BKE_context.h 2009-01-15 04:38:18 UTC (rev 18517) @@ -47,6 +47,8 @@ struct
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18518] branches/blender2.5/blender/source /blender: Brought back anchored mode for sculpt brushes.
Revision: 18518
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18518
Author: nicholasbishop
Date: 2009-01-15 06:09:33 +0100 (Thu, 15 Jan 2009)
Log Message:
---
Brought back anchored mode for sculpt brushes.
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_brush.c
Modified: branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
===
--- branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-15 04:38:18 UTC (rev 18517)
+++ branches/blender2.5/blender/source/blender/editors/sculpt/sculpt.c
2009-01-15 05:09:33 UTC (rev 18518)
@@ -136,16 +136,19 @@
For descriptions of these settings, check the operator properties.
*/
typedef struct StrokeCache {
+ /* Invariants */
float radius;
float scale[3];
int flag;
float clip_tolerance[3];
- int mouse[2];
+ int initial_mouse[2];
float depth;
+ /* Variants */
float true_location[3];
float location[3];
float flip;
+ int mouse[2];
/* Truly temporary storage that isn't saved as a property */
MVert *mvert; /* Can be either Mesh mverts or MultiresDM mverts */
@@ -153,6 +156,8 @@
float *layer_disps; /* Displacements for each vertex */
float (*mesh_store)[3]; /* Copy of the mesh vertices' locations */
short (*orig_norms)[3]; /* Copy of the mesh vertices' normals */
+ int anchored_rotation; /* Texture rotation in anchored mode */
+ int pixel_radius, previous_pixel_radius;
} StrokeCache;
typedef struct BrushAction {
@@ -160,13 +165,6 @@
char firsttime;
- float prev_radius;
- float radius;
-
- //float *layer_disps;
-
- float anchored_rot;
-
/* Grab brush */
ListBase grab_active_verts[8];
} BrushAction;
@@ -790,8 +788,8 @@
externtex(mtex,point,avg,jnk,jnk,jnk,jnk);
}
else if(ss-texcache) {
- const float bsize= a-radius * 2;
- const float rot= to_rad(sculpt_tex_angle(sd)) + a-anchored_rot;
+ const float bsize= ss-cache-pixel_radius * 2;
+ const float rot= to_rad(sculpt_tex_angle(sd)) +
ss-cache-anchored_rotation;
int px, py;
float flip[3], point_2d[2];
@@ -827,8 +825,8 @@
py %= sy-1;
avg= get_texcache_pixel_bilinear(ss, TC_SIZE*px/sx,
TC_SIZE*py/sy);
} else {
- float fx= (point_2d[0] - ss-cache-mouse[0]) / bsize;
- float fy= (point_2d[1] - ss-cache-mouse[1]) / bsize;
+ float fx= (point_2d[0] - ss-cache-initial_mouse[0]) /
bsize;
+ float fy= (point_2d[1] - ss-cache-initial_mouse[1]) /
bsize;
float angle= atan2(fy, fx) - rot;
float flen= sqrtf(fx*fx + fy*fy);
@@ -852,7 +850,7 @@
{
short p[2];
RectNode *rn= MEM_mallocN(sizeof(RectNode),RectNode);
- const float radius = a-radius a-prev_radius ? a-radius :
a-prev_radius;
+ const float radius = MAX2(ss-cache-pixel_radius,
ss-cache-previous_pixel_radius);
unsigned i;
/* Find center */
@@ -1598,6 +1596,27 @@
mats-viewport[3] = ar-winy;
}
+static float unproject_brush_radius(SculptSession *ss, float offset)
+{
+ float brush_edge[3];
+
+ /* In anchored mode, brush size changes with mouse loc, otherwise it's
fixed using the brush radius */
+ unproject(ss, brush_edge, ss-cache-initial_mouse[0] + offset,
+ ss-cache-initial_mouse[1], ss-cache-depth);
+
+ return VecLenf(ss-cache-true_location, brush_edge);
+}
+
+static void sculpt_cache_free(StrokeCache *cache)
+{
+ if(cache-layer_disps)
+ MEM_freeN(cache-layer_disps);
+ if(cache-mesh_store)
+ MEM_freeN(cache-mesh_store);
+ if(cache-orig_norms)
+ MEM_freeN(cache-orig_norms);
+}
+
/* Initialize the stroke cache invariants from operator properties */
static void sculpt_update_cache_invariants(SculptData *sd, wmOperator *op,
Object *ob)
{
@@ -1606,38 +1625,57 @@
memset(cache, 0, sizeof(StrokeCache));
- cache-radius = RNA_float_get(op-ptr, radius);
RNA_float_get_array(op-ptr, scale, cache-scale);
cache-flag = RNA_int_get(op-ptr, flag);
RNA_float_get_array(op-ptr, clip_tolerance, cache-clip_tolerance);
- RNA_int_get_array(op-ptr, mouse, cache-mouse);
+ RNA_int_get_array(op-ptr, initial_mouse, cache-initial_mouse);
cache-depth = RNA_float_get(op-ptr, depth);
/* Truly temporary data that isn't stored in properties */
cache-totvert =
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18519] branches/blender2.5/blender/source /blender: disallow identifiers with spaces 'cap end' wasn' t working with the python api and made doc gener
Revision: 18519
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18519
Author: campbellbarton
Date: 2009-01-15 06:41:25 +0100 (Thu, 15 Jan 2009)
Log Message:
---
disallow identifiers with spaces 'cap end' wasn't working with the python api
and made doc generation fail
Modified Paths:
--
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
===
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
2009-01-15 05:09:33 UTC (rev 18518)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_add.c
2009-01-15 05:41:25 UTC (rev 18519)
@@ -1604,7 +1604,7 @@
dia = RNA_float_get(op-ptr,radius);
- make_prim(obedit, PRIM_CONE, mat, RNA_int_get(op-ptr,vertices), 32,
2, dia, RNA_float_get(op-ptr,depth)/2, 1, RNA_int_get(op-ptr,cap end));
+ make_prim(obedit, PRIM_CONE, mat, RNA_int_get(op-ptr,vertices), 32,
2, dia, RNA_float_get(op-ptr,depth)/2, 1, RNA_int_get(op-ptr,cap_end));
ED_undo_push(C, Add Cone);// Note this will become depricated
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
@@ -1630,7 +1630,7 @@
RNA_def_property(ot-srna, vertices, PROP_INT, PROP_NONE);
RNA_def_property(ot-srna, radius, PROP_FLOAT, PROP_NONE);
RNA_def_property(ot-srna, depth, PROP_FLOAT, PROP_NONE);
- RNA_def_property(ot-srna, cap end,PROP_INT, PROP_NONE);
+ RNA_def_property(ot-srna, cap_end,PROP_INT, PROP_NONE);
}
static int add_primitive_grid_exec(bContext *C, wmOperator *op)
@@ -1687,4 +1687,4 @@
/* api callbacks */
ot-exec= add_primitive_monkey_exec;
ot-poll= ED_operator_editmesh;
-}
\ No newline at end of file
+}
Modified: branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
===
--- branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
2009-01-15 05:09:33 UTC (rev 18518)
+++ branches/blender2.5/blender/source/blender/editors/mesh/mesh_ops.c
2009-01-15 05:41:25 UTC (rev 18519)
@@ -136,7 +136,7 @@
RNA_int_set(cone-ptr,vertices,32);
RNA_float_set(cone-ptr,radius,2);
RNA_float_set(cone-ptr,depth,-3);
- RNA_float_set(cone-ptr,cap end,0);
+ RNA_float_set(cone-ptr,cap_end,0);
WM_keymap_add_item(keymap, MESH_OT_add_primitive_grid, NINEKEY,
KM_PRESS, KM_CTRL, 0);
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
===
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
2009-01-15 05:09:33 UTC (rev 18518)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_define.c
2009-01-15 05:41:25 UTC (rev 18519)
@@ -200,6 +200,11 @@
continue;
}
+ if (identifier[a]==' ') {
+ strcpy(error, spaces are not ok in identifier names);
+ return 0;
+ }
+
if (isalnum(identifier[a])==0) {
strcpy(error, one of the characters failed an
isalnum() check and is not an underscore);
return 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 [18520] branches/blender2.5/blender/source /blender/editors/space_image/SConscript: Tweak scons linking order priority to fix compile on windows.
Revision: 18520 http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=revroot=bf-blenderrevision=18520 Author: blendix Date: 2009-01-15 06:51:00 +0100 (Thu, 15 Jan 2009) Log Message: --- Tweak scons linking order priority to fix compile on windows. Modified Paths: -- branches/blender2.5/blender/source/blender/editors/space_image/SConscript Modified: branches/blender2.5/blender/source/blender/editors/space_image/SConscript === --- branches/blender2.5/blender/source/blender/editors/space_image/SConscript 2009-01-15 05:41:25 UTC (rev 18519) +++ branches/blender2.5/blender/source/blender/editors/space_image/SConscript 2009-01-15 05:51:00 UTC (rev 18520) @@ -7,4 +7,4 @@ incs += ' ../../windowmanager #/intern/guardedalloc #/extern/glew/include' incs += ' ../../render/extern/include ../../makesrna' -env.BlenderLib ( 'bf_editors_space_image', sources, Split(incs), [], libtype=['core'], priority=[45] ) +env.BlenderLib ( 'bf_editors_space_image', sources, Split(incs), [], libtype=['core'], priority=[40] ) ___ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs
