[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60942] trunk/blender/source: rename give_cursor to ED_view3d_cursor3d_get
Campbell Barton
ideasman42 at gmail.com
Sat Oct 26 06:07:18 CEST 2013
Revision: 60942
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60942
Author: campbellbarton
Date: 2013-10-26 04:07:18 +0000 (Sat, 26 Oct 2013)
Log Message:
-----------
rename give_cursor to ED_view3d_cursor3d_get
Modified Paths:
--------------
trunk/blender/source/blender/editors/armature/armature_add.c
trunk/blender/source/blender/editors/armature/armature_edit.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/include/ED_view3d.h
trunk/blender/source/blender/editors/mesh/editmesh_bisect.c
trunk/blender/source/blender/editors/mesh/editmesh_extrude.c
trunk/blender/source/blender/editors/mesh/editmesh_tools.c
trunk/blender/source/blender/editors/object/object_add.c
trunk/blender/source/blender/editors/object/object_transform.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_snap.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_manipulator.c
trunk/blender/source/blender/editors/uvedit/uvedit_unwrap_ops.c
trunk/blender/source/blender/makesrna/intern/rna_space.c
trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Modified: trunk/blender/source/blender/editors/armature/armature_add.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_add.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/armature/armature_add.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -176,7 +176,7 @@
newbone->flag |= BONE_CONNECTED;
}
- curs = give_cursor(scene, v3d);
+ curs = ED_view3d_cursor3d_get(scene, v3d);
copy_v3_v3(newbone->tail, curs);
sub_v3_v3v3(newbone->tail, newbone->tail, obedit->obmat[3]);
@@ -216,7 +216,7 @@
ar = CTX_wm_region(C);
v3d = CTX_wm_view3d(C);
- fp = give_cursor(scene, v3d);
+ fp = ED_view3d_cursor3d_get(scene, v3d);
copy_v3_v3(oldcurs, fp);
@@ -691,7 +691,7 @@
RNA_string_get(op->ptr, "name", name);
- copy_v3_v3(curs, give_cursor(CTX_data_scene(C), CTX_wm_view3d(C)));
+ copy_v3_v3(curs, ED_view3d_cursor3d_get(CTX_data_scene(C), CTX_wm_view3d(C)));
/* Get inverse point for head and orientation for tail */
invert_m4_m4(obedit->imat, obedit->obmat);
Modified: trunk/blender/source/blender/editors/armature/armature_edit.c
===================================================================
--- trunk/blender/source/blender/editors/armature/armature_edit.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/armature/armature_edit.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -252,7 +252,7 @@
Scene *scene = CTX_data_scene(C);
View3D *v3d = CTX_wm_view3d(C); /* can be NULL */
float cursor_local[3];
- const float *cursor = give_cursor(scene, v3d);
+ const float *cursor = ED_view3d_cursor3d_get(scene, v3d);
copy_v3_v3(cursor_local, cursor);
@@ -502,7 +502,7 @@
/* Get points - cursor (tail) */
invert_m4_m4(obedit->imat, obedit->obmat);
- mul_v3_m4v3(curs, obedit->imat, give_cursor(scene, v3d));
+ mul_v3_m4v3(curs, obedit->imat, ED_view3d_cursor3d_get(scene, v3d));
/* Create a bone */
/* newbone = */ add_points_bone(obedit, ebp->vec, curs);
@@ -536,7 +536,7 @@
/* get cursor location */
invert_m4_m4(obedit->imat, obedit->obmat);
- mul_v3_m4v3(curs, obedit->imat, give_cursor(scene, v3d));
+ mul_v3_m4v3(curs, obedit->imat, ED_view3d_cursor3d_get(scene, v3d));
/* get distances */
sub_v3_v3v3(vecA, ebp->vec, curs);
Modified: trunk/blender/source/blender/editors/curve/editcurve.c
===================================================================
--- trunk/blender/source/blender/editors/curve/editcurve.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/curve/editcurve.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -4485,7 +4485,7 @@
if (rv3d)
copy_v3_v3(axis, rv3d->viewinv[2]);
- RNA_float_set_array(op->ptr, "center", give_cursor(scene, v3d));
+ RNA_float_set_array(op->ptr, "center", ED_view3d_cursor3d_get(scene, v3d));
RNA_float_set_array(op->ptr, "axis", axis);
return spin_exec(C, op);
@@ -4821,7 +4821,7 @@
mul_v3_m4v3(location, vc.obedit->obmat, bp->vec);
}
else {
- copy_v3_v3(location, give_cursor(vc.scene, vc.v3d));
+ copy_v3_v3(location, ED_view3d_cursor3d_get(vc.scene, vc.v3d));
}
ED_view3d_win_to_3d_int(vc.ar, location, event->mval, location);
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -454,7 +454,7 @@
copy_v3_v3(p3d, &pt->x);
}
else {
- const float *fp = give_cursor(scene, v3d);
+ const float *fp = ED_view3d_cursor3d_get(scene, v3d);
float mvalf[2];
/* get screen coordinate */
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -211,7 +211,7 @@
static void gp_get_3d_reference(tGPsdata *p, float vec[3])
{
View3D *v3d = p->sa->spacedata.first;
- const float *fp = give_cursor(p->scene, v3d);
+ const float *fp = ED_view3d_cursor3d_get(p->scene, v3d);
/* the reference point used depends on the owner... */
#if 0 /* XXX: disabled for now, since we can't draw relative to the owner yet */
Modified: trunk/blender/source/blender/editors/include/ED_view3d.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_view3d.h 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/include/ED_view3d.h 2013-10-26 04:07:18 UTC (rev 60942)
@@ -82,8 +82,8 @@
bool damaged;
} ViewDepths;
-float *give_cursor(struct Scene *scene, struct View3D *v3d);
-void ED_view3d_cursor3d_position(struct bContext *C, float fp[3], const int mval[2]);
+float *ED_view3d_cursor3d_get(struct Scene *scene, struct View3D *v3d);
+void ED_view3d_cursor3d_position(struct bContext *C, float fp[3], const int mval[2]);
void ED_view3d_to_m4(float mat[4][4], const float ofs[3], const float quat[4], const float dist);
void ED_view3d_from_m4(float mat[4][4], float ofs[3], float quat[4], float *dist);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_bisect.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_bisect.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/mesh/editmesh_bisect.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -203,7 +203,7 @@
RNA_property_float_get_array(op->ptr, prop_plane_co, plane_co);
}
else {
- copy_v3_v3(plane_co, give_cursor(scene, v3d));
+ copy_v3_v3(plane_co, ED_view3d_cursor3d_get(scene, v3d));
RNA_property_float_set_array(op->ptr, prop_plane_co, plane_co);
}
Modified: trunk/blender/source/blender/editors/mesh/editmesh_extrude.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_extrude.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/mesh/editmesh_extrude.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -653,7 +653,7 @@
BM_ELEM_SELECT, min);
}
else {
- const float *curs = give_cursor(vc.scene, vc.v3d);
+ const float *curs = ED_view3d_cursor3d_get(vc.scene, vc.v3d);
BMOperator bmop;
BMOIter oiter;
@@ -751,7 +751,7 @@
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = ED_view3d_context_rv3d(C);
- RNA_float_set_array(op->ptr, "center", give_cursor(scene, v3d));
+ RNA_float_set_array(op->ptr, "center", ED_view3d_cursor3d_get(scene, v3d));
RNA_float_set_array(op->ptr, "axis", rv3d->viewinv[2]);
return edbm_spin_exec(C, op);
@@ -871,7 +871,7 @@
View3D *v3d = CTX_wm_view3d(C);
RegionView3D *rv3d = ED_view3d_context_rv3d(C);
- RNA_float_set_array(op->ptr, "center", give_cursor(scene, v3d));
+ RNA_float_set_array(op->ptr, "center", ED_view3d_cursor3d_get(scene, v3d));
RNA_float_set_array(op->ptr, "axis", rv3d->viewinv[1]);
return edbm_screw_exec(C, op);
Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -1615,7 +1615,7 @@
const float *vco = NULL;
if (use_cursor) {
- vco = give_cursor(scene, v3d);
+ vco = ED_view3d_cursor3d_get(scene, v3d);
copy_v3_v3(co, vco);
mul_m4_v3(ob->imat, co);
}
Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/object/object_add.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -152,7 +152,7 @@
Scene *scene = CTX_data_scene(C);
const float *cursor;
- cursor = give_cursor(scene, v3d);
+ cursor = ED_view3d_cursor3d_get(scene, v3d);
copy_v3_v3(loc, cursor);
}
Modified: trunk/blender/source/blender/editors/object/object_transform.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_transform.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/object/object_transform.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -712,7 +712,7 @@
else {
/* get the view settings if 'around' isn't set and the view is available */
View3D *v3d = CTX_wm_view3d(C);
- copy_v3_v3(cursor, give_cursor(scene, v3d));
+ copy_v3_v3(cursor, ED_view3d_cursor3d_get(scene, v3d));
if (v3d && !RNA_struct_property_is_set(op->ptr, "center"))
around = v3d->around;
}
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
===================================================================
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -3307,7 +3307,7 @@
/* setup clone offset */
if (ps->tool == PAINT_TOOL_CLONE) {
float projCo[4];
- copy_v3_v3(projCo, give_cursor(ps->scene, ps->v3d));
+ copy_v3_v3(projCo, ED_view3d_cursor3d_get(ps->scene, ps->v3d));
mul_m4_v3(ps->ob->imat, projCo);
projCo[3] = 1.0f;
@@ -4163,7 +4163,7 @@
if (ps->tool == PAINT_TOOL_CLONE && ps->mode == BRUSH_STROKE_INVERT) {
Scene *scene = ps->scene;
View3D *v3d = ps->v3d;
- float *cursor = give_cursor(scene, v3d);
+ float *cursor = ED_view3d_cursor3d_get(scene, v3d);
int mval_i[2] = {(int)pos[0], (int)pos[1]};
view3d_operator_needs_opengl(C);
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_draw.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-10-26 03:56:32 UTC (rev 60941)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_draw.c 2013-10-26 04:07:18 UTC (rev 60942)
@@ -567,7 +567,7 @@
int co[2];
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list