[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19040] branches/blender2.5/blender/source : 2.5
Ton Roosendaal
ton at blender.org
Thu Feb 19 17:22:09 CET 2009
Revision: 19040
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19040
Author: ton
Date: 2009-02-19 17:22:07 +0100 (Thu, 19 Feb 2009)
Log Message:
-----------
2.5
Assorted smaller fixes:
- Fix: modal keymaps for editmode in view3d were not set again
when you copy areas or go fullscreen.
- Improved "redo last op" (F6) to search back in history for
a redoable operator. Operator also used wrong pupmenu type.
- On creating new FCurve editor, the channel rainbow colors are
set correct.
- EditMesh: fixed code for Spin/Screw, correct props, init and
error reporting. (Spin hotkey ALT+R temporary)
- recompiled all to check for uninitialized variable warnings.
(compile flag should be -O for this). Fixed some proto's.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
branches/blender2.5/blender/source/blender/editors/mesh/editface.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c
branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
branches/blender2.5/blender/source/blender/editors/object/object_edit.c
branches/blender2.5/blender/source/blender/editors/screen/area.c
branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
branches/blender2.5/blender/source/blender/editors/space_node/node_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/space_view3d.c
branches/blender2.5/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/blender2.5/blender/source/blender/editors/space_view3d/vpaint.c
branches/blender2.5/blender/source/blender/editors/util/editmode_undo.c
branches/blender2.5/blender/source/blender/editors/uvedit/uvedit_ops.c
branches/blender2.5/blender/source/blender/makesdna/DNA_view3d_types.h
branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/blender2.5/blender/source/nan_compile.mk
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -1579,7 +1579,7 @@
PoseTree *tree;
PoseTarget *target;
bConstraint *con;
- bKinematicConstraint *data;
+ bKinematicConstraint *data= NULL;
int a, segcount= 0, size, newsize, *oldparent, parent;
/* find IK constraint, and validate it */
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/brush.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -1056,7 +1056,7 @@
void brush_radial_control_invoke(wmOperator *op, Brush *br)
{
int mode = RNA_int_get(op->ptr, "mode");
- float original_value;
+ float original_value= 0;
if(mode == WM_RADIALCONTROL_SIZE)
original_value = br->size;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/image.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/image.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -1051,7 +1051,7 @@
}
if (scene->r.stamp & R_STAMP_SEQSTRIP) {
- Sequence *seq; //XXX = get_forground_frame_seq(scene->r.cfra);
+ Sequence *seq= NULL; //XXX = get_forground_frame_seq(scene->r.cfra);
if (seq) strcpy(text, seq->name+2);
else strcpy(text, "<none>");
@@ -1800,7 +1800,7 @@
/* always returns a single ibuf, also during render progress */
static ImBuf *image_get_render_result(Image *ima, ImageUser *iuser)
{
- Render *re;
+ Render *re= NULL;
RenderResult *rr= NULL;
if(iuser->scene) {
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -236,7 +236,7 @@
for(i = 0; i < me->totface; ++i) {
const int end = me->mface[i].v4 ? 4 : 3;
- int x, y, x2, y2, mov;
+ int x, y, x2, y2, mov= 0;
mvd_f1 += 1 + end * (slo2-2); //center+edgecross
mvd_f3 = mvd_f4 = mvd_f1;
@@ -268,7 +268,7 @@
/* Main face verts */
for(k = 0; k < 4; ++k) {
- int movx, movy;
+ int movx= 0, movy= 0;
if(k == 0) { movx = -1; movy = -(slo2 - 2); }
else if(k == 1) { movx = slo2 - 2; movy = -1; }
Modified: branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -4462,6 +4462,7 @@
rv3d->ri= NULL;
rv3d->sms= NULL;
rv3d->smooth_timer= NULL;
+ rv3d->lastmode= 0;
}
}
Modified: branches/blender2.5/blender/source/blender/editors/animation/keyframing.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/animation/keyframing.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/editors/animation/keyframing.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -27,6 +27,7 @@
#include "BKE_animsys.h"
#include "BKE_action.h"
+#include "BKE_constraint.h"
#include "BKE_fcurve.h"
#include "BKE_utildefines.h"
#include "BKE_context.h"
Modified: branches/blender2.5/blender/source/blender/editors/armature/editarmature.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/editors/armature/editarmature.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -1299,7 +1299,7 @@
/* previously known as "selectconnected_posearmature" */
static int pose_select_connected_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
- Bone *bone, *curBone, *next;
+ Bone *bone, *curBone, *next= NULL;
int shift= 0; // XXX in pose mode, Shift+L is bound to another command
// named "PoseLib Add Current Pose"
int x, y;
@@ -3045,7 +3045,6 @@
{
RegionView3D *rv3d= CTX_wm_region_view3d(C);
Object *obedit = CTX_data_edit_object(C);
- bArmature *arm= (bArmature *)obedit->data;
EditBone *bone;
float obmat[3][3], curs[3], viewmat[3][3], totmat[3][3], imat[3][3];
char name[32];
Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -309,7 +309,7 @@
PropertyRNA *iterprop, *prop;
PropertySubType subtype;
char *name, namebuf[128];
- int a, length, x= 0, y= 0;
+ int a= 0, length, x= 0, y= 0;
x= 0;
y= 0;
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editdeform.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -990,7 +990,7 @@
{
VPaint *wp= scene->toolsettings->wpaint;
int defCount;
- int mode;
+ int mode= 0;
/* prevent crashes */
if (wp==NULL || ob==NULL) return;
@@ -1032,7 +1032,7 @@
void vgroup_operation_with_menu(Object *ob)
{
int defCount;
- int mode;
+ int mode= 0;
/* prevent crashes and useless cases */
if (ob==NULL) return;
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editface.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editface.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editface.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -676,7 +676,7 @@
rcti rect;
struct ImBuf *ibuf;
unsigned int *rt;
- int a, sx, sy, index, val;
+ int a, sx, sy, index, val= 0;
char *selar;
me= get_mesh(OBACT);
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_loop.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -206,7 +206,7 @@
float fac;
int keys = 0, holdnum=0, selectmode, dist;
short mvalo[2] = {0,0}, mval[2];
- short event, val, choosing=1, cancel=0, cuthalf = 0, smooth=0;
+ short event=0, val, choosing=1, cancel=0, cuthalf = 0, smooth=0;
short hasHidden = 0;
char msg[128];
Modified: branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c 2009-02-19 13:42:07 UTC (rev 19039)
+++ branches/blender2.5/blender/source/blender/editors/mesh/editmesh_tools.c 2009-02-19 16:22:07 UTC (rev 19040)
@@ -818,21 +818,22 @@
RNA_def_float(ot->srna, "offset", 2.0f, 0.0f, 100.0f, "Offset", "", 0.0f, FLT_MAX);
RNA_def_int(ot->srna, "steps", 10, 0, 180, "Steps", "", 0, INT_MAX);
}
+
+/* ************************** spin operator ******************** */
-void spin_mesh(bContext *C, wmOperator *op,float *dvec,int steps, float degr,int mode )
+static int spin_mesh(bContext *C, float *dvec, int steps, float degr, int dupli )
{
Object *obedit= CTX_data_edit_object(C);
View3D *v3d = CTX_wm_view3d(C);
Scene *scene = CTX_data_scene(C);
EditMesh *em= ((Mesh *)obedit->data)->edit_mesh;
-
RegionView3D *rv3d= CTX_wm_region_view3d(C);
EditVert *eve,*nextve;
- float nor[3]= {0.0, 0.0, 0.0};
- float *curs, si,n[3],q[4],cmat[3][3],imat[3][3], tmat[3][3];
- float cent[3],bmat[3][3];
+ float nor[3]= {0.0f, 0.0f, 0.0f};
+ float *curs, si, n[3], q[4], cmat[3][3], imat[3][3], tmat[3][3];
+ float cent[3], bmat[3][3];
float phi;
- short a,ok;
+ short a, ok= 1;
/* imat and center and size */
Mat3CpyMat4(bmat, obedit->obmat);
@@ -870,16 +871,17 @@
Mat3MulMat3(tmat,cmat,bmat);
Mat3MulMat3(bmat,imat,tmat);
- if(mode==0) if(scene->toolsettings->editbutflag & B_KEEPORIG) adduplicateflag(em, 1);
- ok= 1;
+ if(dupli==0)
+ if(scene->toolsettings->editbutflag & B_KEEPORIG)
+ adduplicateflag(em, 1);
- for(a=0;a<steps;a++) {
- if(mode==0) ok= extrudeflag(obedit, em, SELECT, nor);
+ for(a=0; a<steps; a++) {
+ if(dupli==0) ok= extrudeflag(obedit, em, SELECT, nor);
else adduplicateflag(em, SELECT);
- if(ok==0) {
- BKE_report(op->reports, RPT_ERROR, "No valid vertices are selected");
+
+ if(ok==0)
break;
- }
+
rotateflag(em, SELECT, cent, bmat);
if(dvec) {
Mat3MulVecfl(bmat,dvec);
@@ -899,22 +901,29 @@
eve= nextve;
}
}
- recalc_editnormals(em);
+ else {
+ recalc_editnormals(em);
- EM_fgon_flags(em);
+ EM_fgon_flags(em);
- // DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
-
+ DAG_object_flush_update(scene, obedit, OB_RECALC_DATA);
+ }
+
+ return ok;
}
static int spin_mesh_exec(bContext *C, wmOperator *op)
{
Object *obedit= CTX_data_edit_object(C);
+ int ok;
- spin_mesh(C, op,NULL,RNA_int_get(op->ptr,"steps"),RNA_float_get(op->ptr,"degrees"),RNA_int_get(op->ptr,"steps"));
-
WM_event_add_notifier(C, NC_OBJECT|ND_GEOM_SELECT, obedit);
+ ok= spin_mesh(C, NULL, RNA_int_get(op->ptr,"steps"), RNA_float_get(op->ptr,"degrees"), RNA_boolean_get(op->ptr,"dupli"));
+ if(ok==0) {
+ BKE_report(op->reports, RPT_ERROR, "No valid vertices are selected");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list