[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36790] trunk/blender/source/blender/ editors: use event->mval rather then subtracting ar->winrct.x / y from event->x / y
Revision: 36790
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36790
Author: campbellbarton
Date: 2011-05-20 07:40:05 + (Fri, 20 May 2011)
Log Message:
---
use event->mval rather then subtracting ar->winrct.x / y from event->x / y
Modified Paths:
--
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/anim_ops.c
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/curve/editcurve.c
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/interface/interface_handlers.c
trunk/blender/source/blender/editors/interface/view2d_ops.c
trunk/blender/source/blender/editors/physics/particle_edit.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_action/action_select.c
trunk/blender/source/blender/editors/space_file/file_ops.c
trunk/blender/source/blender/editors/space_graph/graph_ops.c
trunk/blender/source/blender/editors/space_graph/graph_select.c
trunk/blender/source/blender/editors/space_image/image_ops.c
trunk/blender/source/blender/editors/space_nla/nla_channels.c
trunk/blender/source/blender/editors/space_nla/nla_select.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_select.c
trunk/blender/source/blender/editors/space_node/node_state.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_add.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_fly.c
trunk/blender/source/blender/editors/transform/transform.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_generics.c
trunk/blender/source/blender/editors/transform/transform_input.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
Modified: trunk/blender/source/blender/editors/animation/anim_channels_edit.c
===
--- trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2011-05-20 05:39:56 UTC (rev 36789)
+++ trunk/blender/source/blender/editors/animation/anim_channels_edit.c
2011-05-20 07:40:05 UTC (rev 36790)
@@ -2148,7 +2148,7 @@
bAnimContext ac;
ARegion *ar;
View2D *v2d;
- int mval[2], channel_index;
+ int channel_index;
int notifierFlags = 0;
short selectmode;
float x, y;
@@ -2162,10 +2162,6 @@
ar= ac.ar;
v2d= &ar->v2d;
- /* get mouse coordinates (in region coordinates) */
- mval[0]= (event->x - ar->winrct.xmin);
- mval[1]= (event->y - ar->winrct.ymin);
-
/* select mode is either replace (deselect all, then add) or add/extend
*/
if (RNA_boolean_get(op->ptr, "extend"))
selectmode= SELECT_INVERT;
@@ -2179,7 +2175,7 @@
* so that the tops of channels get caught ok. Since
ACHANNEL_FIRST is really ACHANNEL_HEIGHT, we simply use
* ACHANNEL_HEIGHT_HALF.
*/
- UI_view2d_region_to_view(v2d, mval[0], mval[1], &x, &y);
+ UI_view2d_region_to_view(v2d, event->mval[0], event->mval[1], &x, &y);
UI_view2d_listview_view_to_cell(v2d, ACHANNEL_NAMEWIDTH, ACHANNEL_STEP,
0, (float)ACHANNEL_HEIGHT_HALF, x, y, NULL, &channel_index);
/* handle mouse-click in the relevant channel then */
Modified: trunk/blender/source/blender/editors/animation/anim_ops.c
===
--- trunk/blender/source/blender/editors/animation/anim_ops.c 2011-05-20
05:39:56 UTC (rev 36789)
+++ trunk/blender/source/blender/editors/animation/anim_ops.c 2011-05-20
07:40:05 UTC (rev 36790)
@@ -107,14 +107,9 @@
{
ARegion *region= CTX_wm_region(C);
float viewx;
- int x, y;
-
- /* convert screen coordinates to region coordinates */
- x= event->x - region->winrct.xmin;
- y= event->y - region->winrct.ymin;
-
+
/* convert from region coordinates to View2D 'tot' space */
- UI_view2d_region_to_view(®ion->v2d, x, y, &viewx, NULL);
+ UI_view2d_region_to_view(®ion->v2d, event->mval[0], event->mval[1],
&viewx, NULL);
/* round result to nearest int (frames are ints!) */
return (int)floor(viewx+0.5f);
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===
--- trunk/blen
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36791] trunk/blender/source/blender/ blenkernel/intern/screen.c: Remedy compile error on windows/ msvc introduced in r36787.
Revision: 36791 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36791 Author: jesterking Date: 2011-05-20 08:52:52 + (Fri, 20 May 2011) Log Message: --- Remedy compile error on windows/msvc introduced in r36787. Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36787 Modified Paths: -- trunk/blender/source/blender/blenkernel/intern/screen.c Modified: trunk/blender/source/blender/blenkernel/intern/screen.c === --- trunk/blender/source/blender/blenkernel/intern/screen.c 2011-05-20 07:40:05 UTC (rev 36790) +++ trunk/blender/source/blender/blenkernel/intern/screen.c 2011-05-20 08:52:52 UTC (rev 36791) @@ -31,6 +31,7 @@ * \ingroup bke */ +#include "BLI_winstuff.h" #include #include ___ 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 [36792] trunk/blender/source/blender: rename mul_project_m4_v4 to mul_project_m4_v3.
Revision: 36792
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36792
Author: campbellbarton
Date: 2011-05-20 10:09:03 + (Fri, 20 May 2011)
Log Message:
---
rename mul_project_m4_v4 to mul_project_m4_v3.
Modified Paths:
--
trunk/blender/source/blender/blenlib/BLI_math_matrix.h
trunk/blender/source/blender/blenlib/intern/math_matrix.c
trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
Modified: trunk/blender/source/blender/blenlib/BLI_math_matrix.h
===
--- trunk/blender/source/blender/blenlib/BLI_math_matrix.h 2011-05-20
08:52:52 UTC (rev 36791)
+++ trunk/blender/source/blender/blenlib/BLI_math_matrix.h 2011-05-20
10:09:03 UTC (rev 36792)
@@ -84,7 +84,7 @@
void mul_mat3_m4_v3(float M[4][4], float r[3]);
void mul_m4_v4(float M[4][4], float r[4]);
void mul_v4_m4v4(float r[4], float M[4][4], float v[4]);
-void mul_project_m4_v4(float M[4][4], float r[3]);
+void mul_project_m4_v3(float M[4][4], float vec[3]);
void mul_m3_v3(float M[3][3], float r[3]);
void mul_v3_m3v3(float r[3], float M[3][3], float a[3]);
Modified: trunk/blender/source/blender/blenlib/intern/math_matrix.c
===
--- trunk/blender/source/blender/blenlib/intern/math_matrix.c 2011-05-20
08:52:52 UTC (rev 36791)
+++ trunk/blender/source/blender/blenlib/intern/math_matrix.c 2011-05-20
10:09:03 UTC (rev 36792)
@@ -340,11 +340,9 @@
vec[2]= x*mat[0][2] + y*mat[1][2] + mat[2][2]*vec[2];
}
-void mul_project_m4_v4(float mat[][4], float *vec)
+void mul_project_m4_v3(float mat[][4], float vec[3])
{
- float w;
-
- w = vec[0]*mat[0][3] + vec[1]*mat[1][3] + vec[2]*mat[2][3] + mat[3][3];
+ const float w= vec[0]*mat[0][3] + vec[1]*mat[1][3] + vec[2]*mat[2][3] +
mat[3][3];
mul_m4_v3(mat, vec);
vec[0] /= w;
Modified: trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
===
--- trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
2011-05-20 08:52:52 UTC (rev 36791)
+++ trunk/blender/source/blender/modifiers/intern/MOD_uvproject.c
2011-05-20 10:09:03 UTC (rev 36792)
@@ -271,7 +271,7 @@
/* if only one projector, project coords to UVs */
if(num_projectors == 1 && projectors[0].uci==NULL)
for(i = 0, co = coords; i < numVerts; ++i, ++co)
- mul_project_m4_v4(projectors[0].projmat, *co);
+ mul_project_m4_v3(projectors[0].projmat, *co);
mface = dm->getFaceArray(dm);
numFaces = dm->getNumFaces(dm);
@@ -345,11 +345,11 @@
project_from_camera(tface->uv[3], coords[mf->v4], best_projector->uci);
}
else {
-
mul_project_m4_v4(best_projector->projmat, co1);
-
mul_project_m4_v4(best_projector->projmat, co2);
-
mul_project_m4_v4(best_projector->projmat, co3);
+
mul_project_m4_v3(best_projector->projmat, co1);
+
mul_project_m4_v3(best_projector->projmat, co2);
+
mul_project_m4_v3(best_projector->projmat, co3);
if(mf->v4)
-
mul_project_m4_v4(best_projector->projmat, co4);
+
mul_project_m4_v3(best_projector->projmat, co4);
/* apply transformed coords as UVs */
tface->uv[0][0] = co1[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 [36793] trunk/blender: simplify window_to_3d_vector() and call it from viewline()
Revision: 36793 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36793 Author: campbellbarton Date: 2011-05-20 10:28:40 + (Fri, 20 May 2011) Log Message: --- simplify window_to_3d_vector() and call it from viewline() also update python view function to match. Modified Paths: -- trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py trunk/blender/source/blender/editors/include/ED_view3d.h trunk/blender/source/blender/editors/space_view3d/view3d_edit.c trunk/blender/source/blender/editors/space_view3d/view3d_view.c Modified: trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py === --- trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py 2011-05-20 10:09:03 UTC (rev 36792) +++ trunk/blender/release/scripts/modules/bpy_extras/view3d_utils.py 2011-05-20 10:28:40 UTC (rev 36793) @@ -36,17 +36,19 @@ """ from mathutils import Vector -viewvec = rv3d.view_matrix.inverted()[2].xyz.normalized() - if rv3d.is_perspective: -dx = (2.0 * coord[0] / region.width) - 1.0 -dy = (2.0 * coord[1] / region.height) - 1.0 +persinv = rv3d.perspective_matrix.inverted() -persmat = rv3d.perspective_matrix.copy() -perspinv_x, perspinv_y = persmat.inverted().to_3x3()[0:2] -return ((perspinv_x * dx + perspinv_y * dy) - viewvec).normalized() +out = Vector(((2.0 * coord[0] / region.width) - 1.0, + (2.0 * coord[1] / region.height) - 1.0, + -0.5 +)) + +w = (out[0] * persinv[0][3]) + (out[1] * persinv[1][3]) + (out[2] * persinv[2][3]) + persinv[3][3] + +return ((out * persinv) / w) - rv3d.view_matrix.inverted()[3].xyz else: -return viewvec +return rv3d.view_matrix.inverted()[2].xyz.normalized() def region_2d_to_location_3d(region, rv3d, coord, depth_location): Modified: trunk/blender/source/blender/editors/include/ED_view3d.h === --- trunk/blender/source/blender/editors/include/ED_view3d.h2011-05-20 10:09:03 UTC (rev 36792) +++ trunk/blender/source/blender/editors/include/ED_view3d.h2011-05-20 10:28:40 UTC (rev 36793) @@ -104,10 +104,10 @@ void project_float(struct ARegion *ar, const float vec[3], float adr[2]); void project_float_noclip(struct ARegion *ar, const float vec[3], float adr[2]); -void viewvector(struct RegionView3D *rv3d, float coord[3], float vec[3]); +void viewvector(struct RegionView3D *rv3d, const float coord[3], float vec[3]); -void viewline(struct ARegion *ar, struct View3D *v3d, float mval[2], float ray_start[3], float ray_end[3]); -void viewray(struct ARegion *ar, struct View3D *v3d, float mval[2], float ray_start[3], float ray_normal[3]); +void viewline(struct ARegion *ar, struct View3D *v3d, const float mval[2], float ray_start[3], float ray_end[3]); +void viewray(struct ARegion *ar, struct View3D *v3d, const float mval[2], float ray_start[3], float ray_normal[3]); void get_object_clip_range(struct Object *ob, float *lens, float *clipsta, float *clipend); int get_view3d_cliprange(struct View3D *v3d, struct RegionView3D *rv3d, float *clipsta, float *clipend); @@ -198,8 +198,4 @@ /* copy the view to the camera */ void ED_view3d_camera_lock_sync(struct View3D *v3d, struct RegionView3D *rv3d); -int view3d_is_ortho(struct View3D *v3d, struct RegionView3D *rv3d); - - #endif /* ED_VIEW3D_H */ - Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c === --- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2011-05-20 10:09:03 UTC (rev 36792) +++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c 2011-05-20 10:28:40 UTC (rev 36793) @@ -419,7 +419,7 @@ } /* for dolly */ - window_to_3d_vector(vod->ar, vod->mousevec, vod->oldx - vod->ar->winrct.xmin, vod->oldy - vod->ar->winrct.ymin); + window_to_3d_vector(vod->ar, vod->mousevec, event->mval[0], event->mval[1]); /* lookup, we dont pass on v3d to prevent confusement */ vod->grid= vod->v3d->grid; Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c === --- trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-05-20 10:09:03 UTC (rev 36792) +++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c 2011-05-20 10:28:40 UTC (rev 36793) @@ -502,29 +502,20 @@ } /* create intersection coordinates in view Z direction at mouse coordinates */ -void viewline(ARegion *ar, View3D *v3d, float mval[2], float ray_start[3], float ray_end[3]) +void viewline(ARegion *ar, View3D *v3d, const float mval[2], float ray_start[3], float r
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36794] trunk/blender/source/blender/ editors/space_view3d: replace checks with rv3d->persp with rv3d-> is_persp since in these cases it only matters
Revision: 36794
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36794
Author: campbellbarton
Date: 2011-05-20 11:15:44 + (Fri, 20 May 2011)
Log Message:
---
replace checks with rv3d->persp with rv3d->is_persp since in these cases it
only matters if its a perspective view matrix, this wouldn't work right for
camera views.
Modified Paths:
--
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-05-20 10:28:40 UTC (rev 36793)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-05-20 11:15:44 UTC (rev 36794)
@@ -1777,7 +1777,7 @@
sub_v3_v3v3(afm, max, min);
size= MAX3(afm[0], afm[1], afm[2]);
- if(rv3d->persp==RV3D_ORTHO) {
+ if(!rv3d->is_persp) {
if(size < 0.0001f) { /* if its a sinble point. dont even
re-scale */
ok_dist= 0;
}
@@ -2034,7 +2034,7 @@
cent[0] = (((double)rect.xmin)+((double)rect.xmax)) / 2;
cent[1] = (((double)rect.ymin)+((double)rect.ymax)) / 2;
- if (rv3d->persp==RV3D_PERSP) {
+ if (rv3d->is_persp) {
double p_corner[3];
/* no depths to use, we cant do anything! */
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_view.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-05-20 10:28:40 UTC (rev 36793)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_view.c
2011-05-20 11:15:44 UTC (rev 36794)
@@ -548,8 +548,7 @@
void viewvector(RegionView3D *rv3d, const float coord[3], float vec[3])
{
- if (rv3d->persp != RV3D_ORTHO)
- {
+ if (rv3d->is_persp) {
float p1[4], p2[4];
copy_v3_v3(p1, coord);
___
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 [36795] branches/cycles/intern/cycles: Cycles: some steps to getting OpenCL backend to compile.
Revision: 36795
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36795
Author: blendix
Date: 2011-05-20 12:26:01 + (Fri, 20 May 2011)
Log Message:
---
Cycles: some steps to getting OpenCL backend to compile.
Modified Paths:
--
branches/cycles/intern/cycles/device/device_opencl.cpp
branches/cycles/intern/cycles/kernel/CMakeLists.txt
branches/cycles/intern/cycles/kernel/kernel.cl
branches/cycles/intern/cycles/kernel/kernel_compat_cuda.h
branches/cycles/intern/cycles/kernel/kernel_compat_opencl.h
branches/cycles/intern/cycles/kernel/kernel_globals.h
branches/cycles/intern/cycles/kernel/kernel_light.h
branches/cycles/intern/cycles/kernel/kernel_triangle.h
branches/cycles/intern/cycles/kernel/kernel_types.h
branches/cycles/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
branches/cycles/intern/cycles/kernel/svm/bsdf_diffuse.h
branches/cycles/intern/cycles/kernel/svm/bsdf_microfacet.h
branches/cycles/intern/cycles/kernel/svm/bsdf_ward.h
branches/cycles/intern/cycles/kernel/svm/bsdf_westin.h
branches/cycles/intern/cycles/kernel/svm/svm_blend.h
branches/cycles/intern/cycles/kernel/svm/svm_displace.h
branches/cycles/intern/cycles/kernel/svm/svm_distorted_noise.h
branches/cycles/intern/cycles/kernel/svm/svm_image.h
branches/cycles/intern/cycles/kernel/svm/svm_mix.h
branches/cycles/intern/cycles/kernel/svm/svm_sky.h
branches/cycles/intern/cycles/kernel/svm/svm_texture.h
branches/cycles/intern/cycles/kernel/svm/svm_types.h
branches/cycles/intern/cycles/util/util_color.h
branches/cycles/intern/cycles/util/util_math.h
Added Paths:
---
branches/cycles/intern/cycles/kernel/kernel_textures.h
Modified: branches/cycles/intern/cycles/device/device_opencl.cpp
===
--- branches/cycles/intern/cycles/device/device_opencl.cpp 2011-05-20
11:15:44 UTC (rev 36794)
+++ branches/cycles/intern/cycles/device/device_opencl.cpp 2011-05-20
12:26:01 UTC (rev 36795)
@@ -55,6 +55,7 @@
cl_int ciErr;
map*> const_mem_map;
map mem_map;
+ device_ptr null_mem;
const char *opencl_error_string(cl_int err)
{
@@ -125,10 +126,10 @@
ciErr = clGetPlatformIDs(1, &cpPlatform, NULL);
opencl_assert(ciErr);
- ciErr = clGetDeviceIDs(cpPlatform, CL_DEVICE_TYPE_GPU, 1,
&cdDevice, NULL);
+ ciErr = clGetDeviceIDs(cpPlatform, CL_DEVICE_TYPE_CPU, 1,
&cdDevice, NULL);
opencl_assert(ciErr);
- cxGPUContext = clCreateContext(0, 1, &cdDevice, NULL
/*clLogMessagesToStdoutAPPLE */, NULL, &ciErr);
+ cxGPUContext = clCreateContext(0, 1, &cdDevice, NULL, NULL,
&ciErr);
opencl_assert(ciErr);
cqCommandQueue = clCreateCommandQueue(cxGPUContext, cdDevice,
0, &ciErr);
@@ -137,11 +138,17 @@
/* compile kernel */
string source = string_printf("#include \"kernel.cl\" //
%lf\n", time_dt());
size_t source_len = source.size();
- string build_options = "-I ../kernel -I ../util -Werror
-DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END="; //" + path_get("kernel") + "
-Werror";
- //printf("path %s\n", path_get("kernel").c_str());
- //clUnloadCompiler();
+ string build_options = "";
+ //string csource = "../blender/intern/cycles";
+ //build_options += "-I " + csource + "/kernel -I " + csource +
"/util";
+
+ build_options += " -I " + path_get("kernel"); /* todo: escape
path */
+
+ build_options += " -Werror";
+ build_options += " -DCCL_NAMESPACE_BEGIN= -DCCL_NAMESPACE_END=";
+
cpProgram = clCreateProgramWithSource(cxGPUContext, 1, (const
char **)&source, &source_len, &ciErr);
opencl_assert(ciErr);
@@ -170,10 +177,15 @@
opencl_assert(ciErr);
ckFilmConvertKernel = clCreateKernel(cpProgram,
"kernel_ocl_tonemap", &ciErr);
opencl_assert(ciErr);
+
+ null_mem = (device_ptr)clCreateBuffer(cxGPUContext,
CL_MEM_READ_ONLY, 1, NULL, &ciErr);
}
~OpenCLDevice()
{
+
+ clReleaseMemObject(CL_MEM_PTR(null_mem));
+
map*>::iterator mt;
for(mt = const_mem_map.begin(); mt != const_mem_map.end();
mt++) {
mem_free(*(mt->second));
@@ -261,6 +273,7 @@
void tex_alloc(const char *name, device_memory& mem, bool
interpolation, bool periodic)
{
mem_alloc(mem, MEM_READ_ONLY);
+ mem_copy_to(mem);
mem_map[name] = &mem;
}
@@ -295,6 +308,11 @@
ciErr |= clSetKernelArg(ckPathTraceKernel, narg++,
sizeof(d_data), (void*)&d_data);
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36796] trunk/blender/build_files/buildbot /config: buildbot:
Revision: 36796
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36796
Author: nazgul
Date: 2011-05-20 13:06:19 + (Fri, 20 May 2011)
Log Message:
---
buildbot:
ffmpeg was compuled with faad now (aac support which keeps
libs gpl2 compatibile).
Updating library dependencies for buildbot rules.
Modified Paths:
--
trunk/blender/build_files/buildbot/config/user-config-i686.py
trunk/blender/build_files/buildbot/config/user-config-x86_64.py
Modified: trunk/blender/build_files/buildbot/config/user-config-i686.py
===
--- trunk/blender/build_files/buildbot/config/user-config-i686.py
2011-05-20 12:26:01 UTC (rev 36795)
+++ trunk/blender/build_files/buildbot/config/user-config-i686.py
2011-05-20 13:06:19 UTC (rev 36796)
@@ -29,7 +29,8 @@
'${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a
${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
'${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a
${BF_FFMPEG_LIBPATH}/libogg.a ' + \
'${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-'${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a
${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
+'${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a
${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a' + \
+'${BF_FFMPEG_LIBPATH}/libfaad.a'
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
Modified: trunk/blender/build_files/buildbot/config/user-config-x86_64.py
===
--- trunk/blender/build_files/buildbot/config/user-config-x86_64.py
2011-05-20 12:26:01 UTC (rev 36795)
+++ trunk/blender/build_files/buildbot/config/user-config-x86_64.py
2011-05-20 13:06:19 UTC (rev 36796)
@@ -29,7 +29,8 @@
'${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a
${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
'${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a
${BF_FFMPEG_LIBPATH}/libogg.a ' + \
'${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-'${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a
${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a'
+'${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a
${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a' + \
+'${BF_FFMPEG_LIBPATH}/libfaad.a'
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
___
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 [36797] trunk/blender/source/blender/ editors: function rename to give clearer meaning that they change from window to 3d coordinates .
Revision: 36797 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36797 Author: campbellbarton Date: 2011-05-20 13:09:34 + (Fri, 20 May 2011) Log Message: --- function rename to give clearer meaning that they change from window to 3d coordinates. some functions had vague names, I even ended up re-writing some of these functions by accident! also added doxy comments. * ED_view3d_win_to_3d (was window_to_3d) * ED_view3d_win_to_delta (was window_to_3d_delta) * ED_view3d_win_to_vector (was window_to_3d_vector / viewvector) * ED_view3d_win_to_segment_clip (was viewline) * ED_view3d_win_to_ray (was viewray) Modified Paths: -- trunk/blender/source/blender/editors/armature/editarmature.c trunk/blender/source/blender/editors/armature/editarmature_sketch.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/physics/particle_edit.c trunk/blender/source/blender/editors/sculpt_paint/paint_image.c trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c trunk/blender/source/blender/editors/sculpt_paint/sculpt.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_select.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_manipulator.c trunk/blender/source/blender/editors/transform/transform_snap.c Modified: trunk/blender/source/blender/editors/armature/editarmature.c === --- trunk/blender/source/blender/editors/armature/editarmature.c 2011-05-20 13:06:19 UTC (rev 36796) +++ trunk/blender/source/blender/editors/armature/editarmature.c 2011-05-20 13:09:34 UTC (rev 36797) @@ -2501,7 +2501,7 @@ copy_v3_v3(oldcurs, fp); - window_to_3d(ar, tvec, fp, event->mval[0], event->mval[1]); + ED_view3d_win_to_3d(ar, fp, event->mval[0], event->mval[1], tvec); copy_v3_v3(fp, tvec); /* extrude to the where new cursor is and store the operation result */ Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c === --- trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2011-05-20 13:06:19 UTC (rev 36796) +++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c 2011-05-20 13:09:34 UTC (rev 36797) @@ -1005,7 +1005,7 @@ float pval[2]; project_float(ar, stk->points[i].p, pval); - viewray(ar, v3d, pval, ray_start, ray_normal); + ED_view3d_win_to_ray(ar, v3d, pval, ray_start, ray_normal); mul_v3_fl(ray_normal, distance * progress / length); add_v3_v3(stk->points[i].p, ray_normal); @@ -1032,7 +1032,7 @@ /* method taken from editview.c - mouse_cursor() */ project_short_noclip(ar, fp, cval); - window_to_3d_delta(ar, dvec, cval[0] - dd->mval[0], cval[1] - dd->mval[1]); + ED_view3d_win_to_delta(ar, cval[0] - dd->mval[0], cval[1] - dd->mval[1], dvec); sub_v3_v3v3(vec, fp, dvec); } @@ -1721,7 +1721,7 @@ mval[0] = vi[0]; mval[1] = vi[1]; - viewline(ar, v3d, mval, ray_start, ray_end); + ED_view3d_win_to_segment_clip(ar, v3d, mval, ray_start, ray_end); isect_line_line_v3( stk->points[s_i].p, stk->points[s_i + 1].p, Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c === --- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-05-20 13:06:19 UTC (rev 36796) +++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-05-20 13:09:34 UTC (rev 36797) @@ -401,7 +401,7 @@ /* convert screen coordinate to 3d coordinates * - method taken from editview.c - mouse_cursor() */ - window_to_3d(ar, p3d, fp, mx, my); + ED_view3d_win_to_3d(ar, fp, mx, my, p3d); } } Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c === --- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c 2011-05-20 13
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36798] trunk/blender/build_files/buildbot /config: typo in previous commit
Revision: 36798
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36798
Author: nazgul
Date: 2011-05-20 13:10:40 + (Fri, 20 May 2011)
Log Message:
---
typo in previous commit
Modified Paths:
--
trunk/blender/build_files/buildbot/config/user-config-i686.py
trunk/blender/build_files/buildbot/config/user-config-x86_64.py
Modified: trunk/blender/build_files/buildbot/config/user-config-i686.py
===
--- trunk/blender/build_files/buildbot/config/user-config-i686.py
2011-05-20 13:09:34 UTC (rev 36797)
+++ trunk/blender/build_files/buildbot/config/user-config-i686.py
2011-05-20 13:10:40 UTC (rev 36798)
@@ -29,7 +29,7 @@
'${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a
${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
'${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a
${BF_FFMPEG_LIBPATH}/libogg.a ' + \
'${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-'${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a
${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a' + \
+'${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a
${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
'${BF_FFMPEG_LIBPATH}/libfaad.a'
# Don't depend on system's libstdc++
Modified: trunk/blender/build_files/buildbot/config/user-config-x86_64.py
===
--- trunk/blender/build_files/buildbot/config/user-config-x86_64.py
2011-05-20 13:09:34 UTC (rev 36797)
+++ trunk/blender/build_files/buildbot/config/user-config-x86_64.py
2011-05-20 13:10:40 UTC (rev 36798)
@@ -29,7 +29,7 @@
'${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a
${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
'${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a
${BF_FFMPEG_LIBPATH}/libogg.a ' + \
'${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-'${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a
${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a' + \
+'${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a
${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
'${BF_FFMPEG_LIBPATH}/libfaad.a'
# Don't depend on system's libstdc++
___
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 [36799] trunk/blender/source/blender/ editors: use consistant arguments to ED_view3d_win_* funcs, a single float vector rather then 2 floats.
Revision: 36799
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36799
Author: campbellbarton
Date: 2011-05-20 13:50:41 + (Fri, 20 May 2011)
Log Message:
---
use consistant arguments to ED_view3d_win_* funcs, a single float vector rather
then 2 floats.
Modified Paths:
--
trunk/blender/source/blender/editors/armature/editarmature.c
trunk/blender/source/blender/editors/armature/editarmature_sketch.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/physics/particle_edit.c
trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.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_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_view.c
trunk/blender/source/blender/editors/transform/transform.c
Modified: trunk/blender/source/blender/editors/armature/editarmature.c
===
--- trunk/blender/source/blender/editors/armature/editarmature.c
2011-05-20 13:10:40 UTC (rev 36798)
+++ trunk/blender/source/blender/editors/armature/editarmature.c
2011-05-20 13:50:41 UTC (rev 36799)
@@ -2489,7 +2489,7 @@
ARegion *ar;
View3D *v3d;
RegionView3D *rv3d;
- float *fp = NULL, tvec[3], oldcurs[3];
+ float *fp = NULL, tvec[3], oldcurs[3], mval_f[2];
int retv;
scene= CTX_data_scene(C);
@@ -2501,7 +2501,8 @@
copy_v3_v3(oldcurs, fp);
- ED_view3d_win_to_3d(ar, fp, event->mval[0], event->mval[1], tvec);
+ VECCOPY2D(mval_f, event->mval);
+ ED_view3d_win_to_3d(ar, fp, mval_f, tvec);
copy_v3_v3(fp, tvec);
/* extrude to the where new cursor is and store the operation result */
Modified: trunk/blender/source/blender/editors/armature/editarmature_sketch.c
===
--- trunk/blender/source/blender/editors/armature/editarmature_sketch.c
2011-05-20 13:10:40 UTC (rev 36798)
+++ trunk/blender/source/blender/editors/armature/editarmature_sketch.c
2011-05-20 13:50:41 UTC (rev 36799)
@@ -1022,6 +1022,7 @@
short cval[2];
float fp[3] = {0, 0, 0};
float dvec[3];
+ float mval_f[2];
if (last != NULL)
{
@@ -1032,7 +1033,8 @@
/* method taken from editview.c - mouse_cursor() */
project_short_noclip(ar, fp, cval);
- ED_view3d_win_to_delta(ar, cval[0] - dd->mval[0], cval[1] -
dd->mval[1], dvec);
+ VECSUB2D(mval_f, cval, dd->mval);
+ ED_view3d_win_to_delta(ar, mval_f, dvec);
sub_v3_v3v3(vec, fp, dvec);
}
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-05-20
13:10:40 UTC (rev 36798)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c 2011-05-20
13:50:41 UTC (rev 36799)
@@ -377,31 +377,30 @@
}
else {
float *fp= give_cursor(scene, v3d);
- float mx, my;
+ float mvalf[2];
/* get screen coordinate */
if (gps->flag & GP_STROKE_2DSPACE) {
- int mxi, myi;
+ int mvali[2];
View2D *v2d= &ar->v2d;
- UI_view2d_view_to_region(v2d, pt->x, pt->y, &mxi, &myi);
- mx= mxi;
- my= myi;
+ UI_view2d_view_to_region(v2d, pt->x, pt->y, mvali,
mvali+1);
+ VECCOPY2D(mvalf, mvali);
}
else {
if(subrect) {
- mx= (((float)pt->x/100.0f) * (subrect->xmax -
subrect->xmin)) + subrect->xmin;
- my= (((float)pt->y/100.0f) * (subrect->ymax -
subrect->ymin)) + subrect->ymin;
+ mvalf[0]= (((float)pt->x/100.0f) *
(subrect->xmax - subrect->xmin)) + subrect->xmin;
+ mvalf[1]= (((float)pt->y/100.0f) *
(subrect->ymax - subrect->ymin)) + subrect->ymin;
}
else {
- mx= (float)pt->x / 100.0f * ar->winx;
- my= (float)pt->y / 100.0f * ar->winy;
+ mvalf[0]= (float)pt->x / 100.0f * ar->winx;
+ mvalf[1]= (float)pt->y / 100.0f * ar->winy;
}
}
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36800] trunk/blender/source/blender/ editors: edit gp_stroke_convertcoords not to modify the mval passed to it & make some mval args const elsewhere
Revision: 36800
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36800
Author: campbellbarton
Date: 2011-05-20 14:11:05 + (Fri, 20 May 2011)
Log Message:
---
edit gp_stroke_convertcoords not to modify the mval passed to it & make some
mval args const elsewhere too.
Modified Paths:
--
trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
trunk/blender/source/blender/editors/sculpt_paint/paint_utils.c
trunk/blender/source/blender/editors/sculpt_paint/paint_vertex.c
trunk/blender/source/blender/editors/space_outliner/outliner.c
Modified: trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
===
--- trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
2011-05-20 13:50:41 UTC (rev 36799)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_paint.c
2011-05-20 14:11:05 UTC (rev 36800)
@@ -239,7 +239,7 @@
/* convert screen-coordinates to buffer-coordinates */
// XXX this method needs a total overhaul!
-static void gp_stroke_convertcoords (tGPsdata *p, int mval[2], float out[3],
float *depth)
+static void gp_stroke_convertcoords (tGPsdata *p, const int mval[2], float
out[3], float *depth)
{
bGPdata *gpd= p->gpd;
@@ -251,10 +251,10 @@
*/
}
else {
- const int mx=mval[0], my=mval[1];
+ int mval_prj[2];
float rvec[3], dvec[3];
float mval_f[2];
-
+
/* Current method just converts each point in
screen-coordinates to
* 3D-coordinates using the 3D-cursor as reference. In
general, this
* works OK, but it could of course be improved.
@@ -267,10 +267,9 @@
gp_get_3d_reference(p, rvec);
/* method taken from editview.c - mouse_cursor() */
- project_int_noclip(p->ar, rvec, mval);
+ project_int_noclip(p->ar, rvec, mval_prj);
- mval_f[0]= mval[0] - mx;
- mval_f[0]= mval[1] - my;
+ VECSUB2D(mval_f, mval_prj, mval);
ED_view3d_win_to_delta(p->ar, mval_f, dvec);
sub_v3_v3v3(out, rvec, dvec);
}
@@ -278,12 +277,7 @@
/* 2d - on 'canvas' (assume that p->v2d is set) */
else if ((gpd->sbuffer_sflag & GP_STROKE_2DSPACE) && (p->v2d)) {
- float x, y;
-
- UI_view2d_region_to_view(p->v2d, mval[0], mval[1], &x, &y);
-
- out[0]= x;
- out[1]= y;
+ UI_view2d_region_to_view(p->v2d, mval[0], mval[1], &out[0],
&out[1]);
}
#if 0
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
===
--- trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2011-05-20 13:50:41 UTC (rev 36799)
+++ trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
2011-05-20 14:11:05 UTC (rev 36800)
@@ -3975,7 +3975,7 @@
}
-static int project_paint_sub_stroke(ProjPaintState *ps, BrushPainter *painter,
int *UNUSED(prevmval_i), int *mval_i, double time, float pressure)
+static int project_paint_sub_stroke(ProjPaintState *ps, BrushPainter *painter,
const int UNUSED(prevmval_i[2]), const int mval_i[2], double time, float
pressure)
{
/* Use mouse coords as floats for projection painting */
@@ -3994,7 +3994,7 @@
}
-static int project_paint_stroke(ProjPaintState *ps, BrushPainter *painter, int
*prevmval_i, int *mval_i, double time, float pressure)
+static int project_paint_stroke(ProjPaintState *ps, BrushPainter *painter,
const int prevmval_i[2], const int mval_i[2], double time, float pressure)
{
int a, redraw;
@@ -4417,7 +4417,7 @@
else return 0;
}
-static int imapaint_paint_stroke(ViewContext *vc, ImagePaintState *s,
BrushPainter *painter, short texpaint, int *prevmval, int *mval, double time,
float pressure)
+static int imapaint_paint_stroke(ViewContext *vc, ImagePaintState *s,
BrushPainter *painter, short texpaint, const int prevmval[2], const int
mval[2], double time, float pressure)
{
Image *newimage = NULL;
float fwuv[2], bkuv[2], newuv[2];
Modified: trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
===
--- trunk/blender/source/blender/editors/sculpt_paint/paint_intern.h
2011-05-20 13:50:41 UTC (rev 36799)
+++ trunk/blender/sourc
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36801] trunk/blender/source/blender/ editors/space_view3d/view3d_edit.c: error in recent commit.
Revision: 36801
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36801
Author: campbellbarton
Date: 2011-05-20 16:43:23 + (Fri, 20 May 2011)
Log Message:
---
error in recent commit.
Modified Paths:
--
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
Modified: trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
===
--- trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-05-20 14:11:05 UTC (rev 36800)
+++ trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
2011-05-20 16:43:23 UTC (rev 36801)
@@ -2829,7 +2829,7 @@
if(depth_used==0) {
float mval_f[2];
- VECSUB(mval_f, mval, event->mval);
+ VECSUB2D(mval_f, mval, event->mval);
ED_view3d_win_to_delta(ar, mval_f, dvec);
sub_v3_v3(fp, dvec);
}
___
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 [36802] branches/bmesh/blender: svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/ blender
Revision: 36802 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36802 Author: campbellbarton Date: 2011-05-20 16:52:10 + (Fri, 20 May 2011) Log Message: --- svn merge -r36725:36801 https://svn.blender.org/svnroot/bf-blender/trunk/blender Revision Links: -- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36725 Modified Paths: -- branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py branches/bmesh/blender/release/scripts/modules/bpy/path.py branches/bmesh/blender/release/scripts/modules/bpy/utils.py branches/bmesh/blender/release/scripts/modules/bpy_extras/__init__.py branches/bmesh/blender/release/scripts/modules/bpy_extras/view3d_utils.py branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref_keymap.py branches/bmesh/blender/source/blender/blenkernel/BKE_icons.h branches/bmesh/blender/source/blender/blenkernel/BKE_object.h branches/bmesh/blender/source/blender/blenkernel/BKE_screen.h branches/bmesh/blender/source/blender/blenkernel/BKE_subsurf.h branches/bmesh/blender/source/blender/blenkernel/BKE_world.h branches/bmesh/blender/source/blender/blenkernel/intern/action.c branches/bmesh/blender/source/blender/blenkernel/intern/blender.c branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c branches/bmesh/blender/source/blender/blenkernel/intern/icons.c branches/bmesh/blender/source/blender/blenkernel/intern/material.c branches/bmesh/blender/source/blender/blenkernel/intern/multires.c branches/bmesh/blender/source/blender/blenkernel/intern/object.c branches/bmesh/blender/source/blender/blenkernel/intern/screen.c branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c branches/bmesh/blender/source/blender/blenkernel/intern/shrinkwrap.c branches/bmesh/blender/source/blender/blenkernel/intern/subsurf_ccg.c branches/bmesh/blender/source/blender/blenkernel/intern/world.c branches/bmesh/blender/source/blender/blenlib/BLI_math_geom.h branches/bmesh/blender/source/blender/blenlib/BLI_math_matrix.h branches/bmesh/blender/source/blender/blenlib/BLI_utildefines.h branches/bmesh/blender/source/blender/blenlib/intern/bpath.c branches/bmesh/blender/source/blender/blenlib/intern/math_geom.c branches/bmesh/blender/source/blender/blenlib/intern/math_matrix.c branches/bmesh/blender/source/blender/blenloader/BLO_readfile.h branches/bmesh/blender/source/blender/blenloader/BLO_writefile.h branches/bmesh/blender/source/blender/blenloader/intern/readblenentry.c branches/bmesh/blender/source/blender/blenloader/intern/readfile.c branches/bmesh/blender/source/blender/blenloader/intern/readfile.h branches/bmesh/blender/source/blender/blenloader/intern/writefile.c branches/bmesh/blender/source/blender/editors/animation/anim_channels_edit.c branches/bmesh/blender/source/blender/editors/animation/anim_ops.c branches/bmesh/blender/source/blender/editors/animation/keyingsets.c branches/bmesh/blender/source/blender/editors/armature/editarmature.c branches/bmesh/blender/source/blender/editors/armature/editarmature_sketch.c branches/bmesh/blender/source/blender/editors/armature/poselib.c branches/bmesh/blender/source/blender/editors/curve/editcurve.c branches/bmesh/blender/source/blender/editors/gpencil/gpencil_edit.c branches/bmesh/blender/source/blender/editors/gpencil/gpencil_paint.c branches/bmesh/blender/source/blender/editors/include/ED_keyframing.h branches/bmesh/blender/source/blender/editors/include/ED_view3d.h branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c branches/bmesh/blender/source/blender/editors/interface/interface_layout.c branches/bmesh/blender/source/blender/editors/interface/view2d.c branches/bmesh/blender/source/blender/editors/interface/view2d_ops.c branches/bmesh/blender/source/blender/editors/mesh/editbmesh_bvh.c branches/bmesh/blender/source/blender/editors/mesh/knifetool.c branches/bmesh/blender/source/blender/editors/physics/particle_edit.c branches/bmesh/blender/source/blender/editors/render/CMakeLists.txt branches/bmesh/blender/source/blender/editors/render/render_intern.h branches/bmesh/blender/source/blender/editors/render/render_internal.c branches/bmesh/blender/source/blender/editors/render/render_opengl.c branches/bmesh/blender/source/blender/editors/render/render_preview.c branches/bmesh/blender/source/blender/editors/render/render_shading.c branches/bmesh/blender/source/blender/editors/screen/area.c branches/bmesh/blender/source/blender/editors/screen/scr
[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36803] trunk/blender/release/scripts/ startup/bl_ui: 2.5 Particle UI:
Revision: 36803
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36803
Author: dingto
Date: 2011-05-20 17:08:09 + (Fri, 20 May 2011)
Log Message:
---
2.5 Particle UI:
*In Particle Mode, there was no way to see what p-sys is being edited in the 3D
View Tool bar, when having multiple ones.
Changed List type to normal (with limit to 3 rows). Request by venomgfx. :)
* Removed redundant text info about disconnected hair from Particle UI.
Modified Paths:
--
trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
Modified: trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
===
--- trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
2011-05-20 16:52:10 UTC (rev 36802)
+++ trunk/blender/release/scripts/startup/bl_ui/properties_particle.py
2011-05-20 17:08:09 UTC (rev 36803)
@@ -168,10 +168,8 @@
if psys != None and psys.is_edited:
if psys.is_global_hair:
layout.operator("particle.connect_hair")
-layout.label(text="Hair is disconnected.")
else:
layout.operator("particle.disconnect_hair")
-layout.label(text="")
elif psys != None and part.type == 'REACTOR':
split.enabled = particle_panel_enabled(context, psys)
split.prop(psys, "reactor_target_object")
Modified: trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===
--- trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-05-20 16:52:10 UTC (rev 36802)
+++ trunk/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
2011-05-20 17:08:09 UTC (rev 36803)
@@ -1245,7 +1245,7 @@
if pe.type == 'PARTICLES':
if ob.particle_systems:
if len(ob.particle_systems) > 1:
-layout.template_list(ob, "particle_systems",
ob.particle_systems, "active_index", type='ICONS')
+layout.template_list(ob, "particle_systems",
ob.particle_systems, "active_index", rows=2, maxrows=3)
ptcache = ob.particle_systems.active.point_cache
else:
@@ -1254,7 +1254,7 @@
ptcache = md.point_cache
if ptcache and len(ptcache.point_caches) > 1:
-layout.template_list(ptcache, "point_caches",
ptcache.point_caches, "active_index", type='ICONS')
+layout.template_list(ptcache, "point_caches",
ptcache.point_caches, "active_index", rows=2, maxrows=3)
if not pe.is_editable:
layout.label(text="Point cache must be baked")
___
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 [36804] trunk/blender/source/blender/ editors/space_graph/graph_select.c: was using the wrong rna type for GRAPH_OT_select_leftright
Revision: 36804 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36804 Author: campbellbarton Date: 2011-05-20 18:00:19 + (Fri, 20 May 2011) Log Message: --- was using the wrong rna type for GRAPH_OT_select_leftright Modified Paths: -- trunk/blender/source/blender/editors/space_graph/graph_select.c Modified: trunk/blender/source/blender/editors/space_graph/graph_select.c === --- trunk/blender/source/blender/editors/space_graph/graph_select.c 2011-05-20 17:08:09 UTC (rev 36803) +++ trunk/blender/source/blender/editors/space_graph/graph_select.c 2011-05-20 18:00:19 UTC (rev 36804) @@ -822,9 +822,9 @@ /* determine which side of the current frame mouse is on */ UI_view2d_region_to_view(v2d, event->mval[0], event->mval[1], &x, NULL); if (x < CFRA) - RNA_int_set(op->ptr, "mode", GRAPHKEYS_LRSEL_LEFT); + RNA_enum_set(op->ptr, "mode", GRAPHKEYS_LRSEL_LEFT); else - RNA_int_set(op->ptr, "mode", GRAPHKEYS_LRSEL_RIGHT); + RNA_enum_set(op->ptr, "mode", GRAPHKEYS_LRSEL_RIGHT); } /* perform selection */ ___ 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 [36805] trunk/blender/source/blender/ editors/transform/transform_conversions.c: change transform to round at 0. 5 for fcurves.
Revision: 36805 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36805 Author: campbellbarton Date: 2011-05-20 18:19:29 + (Fri, 20 May 2011) Log Message: --- change transform to round at 0.5 for fcurves. this gave noticeable issue when transforming int/fcurve's below zero. Modified Paths: -- trunk/blender/source/blender/editors/transform/transform_conversions.c Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c === --- trunk/blender/source/blender/editors/transform/transform_conversions.c 2011-05-20 18:00:19 UTC (rev 36804) +++ trunk/blender/source/blender/editors/transform/transform_conversions.c 2011-05-20 18:19:29 UTC (rev 36805) @@ -3699,7 +3699,7 @@ /* if int-values only, truncate to integers */ if (td->flag & TD_INTVALUES) - td2d->loc2d[1]= (float)((int)td2d->loc[1]); + td2d->loc2d[1]= floorf(td2d->loc[1] + 0.5f); else td2d->loc2d[1]= td2d->loc[1]; ___ 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 [36806] trunk/blender/release/scripts/ startup/bl_ui/properties_object_constraint.py: Fix for [#27333] Translation constraint is broken.
Revision: 36806 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36806 Author: dingto Date: 2011-05-20 18:26:44 + (Fri, 20 May 2011) Log Message: --- Fix for [#27333] Translation constraint is broken. Committing here a patch by Bastien Montagne (mont29), a more understandable Translation Constraint UI. Before: http://www.pasteall.org/pic/12578 Now http://www.pasteall.org/pic/12258 >From the description: "When you set ?\226?\128?\156X?\226?\128?\157 under the Destination?\226?\128?\153s ?\226?\128?\156Z?\226?\128?\157, it does not mean that the Z transform of the source should affect the X transform of the destination, but rather that the X transform of the source should affect the Z transform of the destination?\226?\128?\166" The new UI should make it a bit more clear. Modified Paths: -- trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py Modified: trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py === --- trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2011-05-20 18:19:29 UTC (rev 36805) +++ trunk/blender/release/scripts/startup/bl_ui/properties_object_constraint.py 2011-05-20 18:26:44 UTC (rev 36806) @@ -651,8 +651,24 @@ sub.prop(con, "from_min_z", text="Min") sub.prop(con, "from_max_z", text="Max") +col = layout.column() +row = col.row() +row.label(text="Source to Destination Mapping:") + +row = col.row() +row.prop(con, "map_to_x_from", expand=False, text="") +row.label(text=" -> X") + +row = col.row() +row.prop(con, "map_to_y_from", expand=False, text="") +row.label(text=" -> Y") + +row = col.row() +row.prop(con, "map_to_z_from", expand=False, text="") +row.label(text=" -> Z") + split = layout.split() - + col = split.column() col.label(text="Destination:") col.row().prop(con, "map_to", expand=True) @@ -661,7 +677,6 @@ col = split.column() col.label(text="X:") -col.row().prop(con, "map_to_x_from", expand=True) sub = col.column(align=True) sub.prop(con, "to_min_x", text="Min") @@ -669,7 +684,6 @@ col = split.column() col.label(text="Y:") -col.row().prop(con, "map_to_y_from", expand=True) sub = col.column(align=True) sub.prop(con, "to_min_y", text="Min") @@ -677,7 +691,6 @@ col = split.column() col.label(text="Z:") -col.row().prop(con, "map_to_z_from", expand=True) sub = col.column(align=True) sub.prop(con, "to_min_z", text="Min") ___ 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 [36807] trunk/blender/source/blender/ python/intern/bpy.c: patch [#27449] bpy_script_paths() return path reversed [patch]
Revision: 36807 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36807 Author: campbellbarton Date: 2011-05-21 05:34:20 + (Sat, 21 May 2011) Log Message: --- patch [#27449] bpy_script_paths() return path reversed [patch] from Dan Eicher (dna) Modified Paths: -- trunk/blender/source/blender/python/intern/bpy.c Modified: trunk/blender/source/blender/python/intern/bpy.c === --- trunk/blender/source/blender/python/intern/bpy.c2011-05-20 18:26:44 UTC (rev 36806) +++ trunk/blender/source/blender/python/intern/bpy.c2011-05-21 05:34:20 UTC (rev 36807) @@ -77,9 +77,9 @@ PyObject *ret= PyTuple_New(2); char *path; + path= BLI_get_folder(BLENDER_SYSTEM_SCRIPTS, NULL); + PyTuple_SET_ITEM(ret, 0, PyUnicode_FromString(path?path:"")); path= BLI_get_folder(BLENDER_USER_SCRIPTS, NULL); - PyTuple_SET_ITEM(ret, 0, PyUnicode_FromString(path?path:"")); - path= BLI_get_folder(BLENDER_SYSTEM_SCRIPTS, NULL); PyTuple_SET_ITEM(ret, 1, PyUnicode_FromString(path?path:"")); return ret; ___ 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 [36808] trunk/blender/source/blender/ blenloader/intern/readfile.c: Bugfix [#27452] Wrong linking of character groups
Revision: 36808
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36808
Author: aligorith
Date: 2011-05-21 06:04:44 + (Sat, 21 May 2011)
Log Message:
---
Bugfix [#27452] Wrong linking of character groups
Linking in groups also ended up adding those objects to the current
scene that we're linking the group in to. This is a regression. It
leads to more work (and/or confusion) from animators when just trying
to get a character into a shot file to start animating it (see my
notes on my blog for the proper workflow regarding this).
Reverting r36762, which caused this mess.
Revision Links:
--
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36762
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-21
05:34:20 UTC (rev 36807)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-21
06:04:44 UTC (rev 36808)
@@ -12738,13 +12738,6 @@
if(ob->id.us==0) {
do_it= 1;
}
- else if (lib==NULL) { /* appending */
- if(object_in_any_scene(mainvar, ob)==0)
{
- /* when appending, make sure
any indirectly loaded objects
-* get a base else they cant be
accessed at all [#27437] */
- do_it= 1;
- }
- }
else if(ob->id.us==1 && lib) {
if(ob->id.lib==lib && (ob->flag &
OB_FROMGROUP) && object_in_any_scene(mainvar, ob)==0) {
do_it= 1;
___
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 [36809] trunk/blender/source/blender/ blenloader/intern/readfile.c: no functional changes, make give_base_to_objects() arguments less confusing.
Revision: 36809
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36809
Author: campbellbarton
Date: 2011-05-21 06:48:19 + (Sat, 21 May 2011)
Log Message:
---
no functional changes, make give_base_to_objects() arguments less confusing.
Modified Paths:
--
trunk/blender/source/blender/blenloader/intern/readfile.c
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-21
06:04:44 UTC (rev 36808)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2011-05-21
06:48:19 UTC (rev 36809)
@@ -12716,10 +12716,11 @@
}
/* when *lib set, it also does objects that were in the appended group */
-static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib, int
is_group_append)
+static void give_base_to_objects(Main *mainvar, Scene *sce, Library *lib,
const short idcode, const short is_link)
{
Object *ob;
Base *base;
+ const short is_group_append= (is_link==FALSE && idcode==ID_GR);
/* give all objects which are LIB_INDIRECT a base, or for a group when
*lib has been set */
for(ob= mainvar->object.first; ob; ob= ob->id.next) {
@@ -12996,21 +12997,18 @@
/* give a base to loose objects. If group append, do it for objects too
*/
if(scene) {
+ const short is_link= (flag & FILE_LINK) != 0;
if(idcode==ID_SCE) {
/* dont instance anything when linking in scenes,
assume the scene its self instances the data */
}
else if(idcode==ID_GR) {
- if (flag & FILE_LINK) {
- give_base_to_objects(mainvar, scene, NULL, 0);
- } else {
- give_base_to_objects(mainvar, scene, curlib, 1);
- }
+ give_base_to_objects(mainvar, scene, is_link ? NULL :
curlib, idcode, is_link);
if (flag & FILE_GROUP_INSTANCE) {
give_base_to_groups(mainvar, scene);
}
} else {
- give_base_to_objects(mainvar, scene, NULL, 0);
+ give_base_to_objects(mainvar, scene, NULL, idcode,
is_link);
}
}
else {
___
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
