Revision: 43532
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43532
Author: campbellbarton
Date: 2012-01-19 16:30:56 +0000 (Thu, 19 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43524:43530
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43524
Modified Paths:
--------------
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_ops.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawvolume.c
branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_fly.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_intern.h
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_view.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43524
+
/branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43530
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43524
+
/trunk/blender/release:31524-42516,42522-42548,42551-42585,42587-42655,42681-42757,42779-42870,42921-42927,42954-42957,42974-43085,43093-43278,43295-43435,43462-43530
Modified:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
===================================================================
---
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
2012-01-19 16:22:22 UTC (rev 43531)
+++
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
2012-01-19 16:30:56 UTC (rev 43532)
@@ -412,14 +412,14 @@
col.prop(brush, "paint_distance", text="Paint Distance")
split = layout.row().split(percentage=0.4)
sub = split.column()
- if brush.paint_source == 'DISTANCE':
+ if brush.paint_source in {'DISTANCE', 'VOLUME_DISTANCE'}:
sub.prop(brush, "use_proximity_project")
- elif brush.paint_source == 'VOLUME_DISTANCE':
+ if brush.paint_source == 'VOLUME_DISTANCE':
sub.prop(brush, "invert_proximity")
sub.prop(brush, "use_negative_volume")
sub = split.column()
- if brush.paint_source == 'DISTANCE':
+ if brush.paint_source in {'DISTANCE', 'VOLUME_DISTANCE'}:
column = sub.column()
column.active = brush.use_proximity_project
column.prop(brush, "ray_direction")
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-01-19 16:22:22 UTC (rev 43531)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
2012-01-19 16:30:56 UTC (rev 43532)
@@ -3166,7 +3166,7 @@
boundInsert(&mesh_bb, mvert[ii].co);
/* for project brush calculate average normal */
- if (brush->collision & MOD_DPAINT_COL_DIST &&
brush->flags & MOD_DPAINT_PROX_PROJECT) {
+ if (brush->flags & MOD_DPAINT_PROX_PROJECT) {
float nor[3];
normal_short_to_float_v3(nor, mvert[ii].no);
mul_mat3_m4_v3(brushOb->obmat, nor);
@@ -3176,7 +3176,7 @@
}
}
- if (brush->collision & MOD_DPAINT_COL_DIST && brush->flags &
MOD_DPAINT_PROX_PROJECT) {
+ if (brush->flags & MOD_DPAINT_PROX_PROJECT) {
mul_v3_fl(avg_brushNor, 1.0f/(float)numOfVerts);
/* instead of null vector use positive z */
if
(!(MIN3(avg_brushNor[0],avg_brushNor[1],avg_brushNor[2])))
@@ -3317,7 +3317,7 @@
if (inner_proximity &&
!hit_found) continue;
/* If pure distance
proximity, find the nearest point on the mesh */
- if (brush->collision !=
MOD_DPAINT_COL_DIST || !(brush->flags & MOD_DPAINT_PROX_PROJECT)) {
+ if (!(brush->flags &
MOD_DPAINT_PROX_PROJECT)) {
if
(BLI_bvhtree_find_nearest(treeData.tree, ray_start, &nearest,
mesh_faces_nearest_point_dp, &treeData) != -1) {
proxDist = sqrtf(nearest.dist);
copy_v3_v3(hitCo, nearest.co);
Property changes on:
branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
-
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender/source/blender/editors/space_outliner:31524-42495,42522-42548,42671-42680,42779-42839,42992-43033,43279-43338,43421-43435,43483-43524
+
/branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender/source/blender/editors/space_outliner:31524-42495,42522-42548,42671-42680,42779-42839,42992-43033,43279-43338,43421-43435,43483-43530
Modified:
branches/bmesh/blender/source/blender/editors/space_outliner/outliner_ops.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_outliner/outliner_ops.c
2012-01-19 16:22:22 UTC (rev 43531)
+++ branches/bmesh/blender/source/blender/editors/space_outliner/outliner_ops.c
2012-01-19 16:30:56 UTC (rev 43532)
@@ -92,7 +92,6 @@
RNA_boolean_set(kmi->ptr, "extend", TRUE);
WM_keymap_add_item(keymap, "OUTLINER_OT_select_border", BKEY, KM_PRESS,
0, 0);
- RNA_boolean_set(WM_keymap_add_item(keymap, "OUTLINER_OT_select_border",
EVT_TWEAK_L, KM_ANY, 0, 0)->ptr, "tweak", 1);
kmi = WM_keymap_add_item(keymap, "OUTLINER_OT_item_openclose", RETKEY,
KM_PRESS, 0, 0);
RNA_boolean_set(kmi->ptr, "all", FALSE);
Modified:
branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
===================================================================
--- branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
2012-01-19 16:22:22 UTC (rev 43531)
+++ branches/bmesh/blender/source/blender/editors/space_view3d/drawarmature.c
2012-01-19 16:30:56 UTC (rev 43532)
@@ -526,7 +526,8 @@
glEnableClientState(GL_VERTEX_ARRAY);
glNormalPointer(GL_FLOAT, 0, bone_octahedral_solid_normals);
glVertexPointer(3, GL_FLOAT, 0, bone_octahedral_verts);
- glDrawElements(GL_TRIANGLES,
sizeof(bone_octahedral_solid_tris)/sizeof(unsigned int), GL_UNSIGNED_INT,
bone_octahedral_solid_tris);
+ glDrawElements(GL_TRIANGLES,
sizeof(bone_octahedral_solid_tris)/sizeof(unsigned int),
+ GL_UNSIGNED_INT, bone_octahedral_solid_tris);
glDisableClientState(GL_NORMAL_ARRAY);
glDisableClientState(GL_VERTEX_ARRAY);
#endif
@@ -738,7 +739,9 @@
/* smat, imat = mat & imat to draw screenaligned */
-static void draw_sphere_bone_wire(float smat[][4], float imat[][4], int
armflag, int boneflag, short constflag, unsigned int id, bPoseChannel *pchan,
EditBone *ebone)
+static void draw_sphere_bone_wire(float smat[][4], float imat[][4],
+ int armflag, int boneflag, short constflag,
unsigned int id,
+ bPoseChannel *pchan, EditBone *ebone)
{
float head, tail /*, length*/;
float *headvec, *tailvec, dirvec[3];
@@ -843,7 +846,8 @@
}
/* does wire only for outline selecting */
-static void draw_sphere_bone(int dt, int armflag, int boneflag, short
constflag, unsigned int id, bPoseChannel *pchan, EditBone *ebone)
+static void draw_sphere_bone(int dt, int armflag, int boneflag, short
constflag, unsigned int id,
+ bPoseChannel *pchan, EditBone *ebone)
{
GLUquadricObj *qobj;
float head, tail, length;
@@ -973,7 +977,8 @@
static GLubyte bm_dot7[]= {0x0, 0x38, 0x7C, 0xFE, 0xFE, 0xFE, 0x7C, 0x38};
-static void draw_line_bone(int armflag, int boneflag, short constflag,
unsigned int id, bPoseChannel *pchan, EditBone *ebone)
+static void draw_line_bone(int armflag, int boneflag, short constflag,
unsigned int id,
+ bPoseChannel *pchan, EditBone *ebone)
{
float length;
@@ -1107,7 +1112,8 @@
}
}
-static void draw_b_bone(int dt, int armflag, int boneflag, short constflag,
unsigned int id, bPoseChannel *pchan, EditBone *ebone)
+static void draw_b_bone(int dt, int armflag, int boneflag, short constflag,
unsigned int id,
+ bPoseChannel *pchan, EditBone *ebone)
{
float xwidth, length, zwidth;
@@ -1220,7 +1226,8 @@
}
}
-static void draw_wire_bone(int dt, int armflag, int boneflag, short constflag,
unsigned int id, bPoseChannel *pchan, EditBone *ebone)
+static void draw_wire_bone(int dt, int armflag, int boneflag, short constflag,
unsigned int id,
+ bPoseChannel *pchan, EditBone *ebone)
{
Mat4 *bbones = NULL;
int segments = 0;
@@ -1340,7 +1347,8 @@
}
}
-static void draw_custom_bone(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Object *ob, int dt, int armflag, int boneflag, unsigned int id, float length)
+static void draw_custom_bone(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Object *ob,
+ int dt, int armflag, int boneflag, unsigned int
id, float length)
{
if(ob==NULL) return;
@@ -1573,7 +1581,8 @@
glColor3ub(50,
50, 255); // blue, Z axis limit
glBegin(GL_LINE_STRIP);
for (a=-16;
a<=16; a++) {
- float
fac= ((float)a)/16.0f * 0.5f; /* *0.5f here comes from M_PI/360.0f when
rotations were still in degrees */
+ /*
*0.5f here comes from M_PI/360.0f when rotations were still in degrees */
+ float
fac= ((float)a)/16.0f * 0.5f;
phi=
fac * (pchan->limitmax[2] - pchan->limitmin[2]);
@@ -1596,7 +1605,8 @@
glColor3ub(255,
50, 50); // Red, X axis limit
glBegin(GL_LINE_STRIP);
for (a=-16;
a<=16; a++) {
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
