Revision: 44252 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44252 Author: campbellbarton Date: 2012-02-19 17:59:30 +0000 (Sun, 19 Feb 2012) Log Message: ----------- svn merge ^/trunk/blender -r44235:44250
Revision Links: -------------- http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=44235 Modified Paths: -------------- branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h branches/bmesh/blender/source/blender/blenkernel/intern/armature.c branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c branches/bmesh/blender/source/blender/editors/object/object_edit.c branches/bmesh/blender/source/blender/editors/physics/particle_edit.c branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c branches/bmesh/blender/source/blender/editors/transform/transform.c branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c branches/bmesh/blender/source/blender/imbuf/intern/indexer.c branches/bmesh/blender/source/blender/render/intern/source/pixelshading.c branches/bmesh/blender/source/blender/render/intern/source/shadeoutput.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_draw.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_gesture.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_keymap.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c branches/bmesh/blender/source/blender/windowmanager/intern/wm_window.c branches/bmesh/blender/source/creator/creator.c Added Paths: ----------- branches/bmesh/blender/source/tools/tag_release.py Property Changed: ---------------- branches/bmesh/blender/ branches/bmesh/blender/source/ branches/bmesh/blender/source/blender/editors/space_outliner/ Property changes on: branches/bmesh/blender ___________________________________________________________________ Modified: svn:mergeinfo - /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439 /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,43872,44130,44141,44147-44149,44151-44152 /trunk/blender:39992-44235 + /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439 /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,43872,44130,44141,44147-44149,44151-44152,44229-44230 /trunk/blender:39992-44250 Property changes on: branches/bmesh/blender/source ___________________________________________________________________ Added: lock + Lock for bmesh merge. Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h =================================================================== --- branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h 2012-02-19 17:55:09 UTC (rev 44251) +++ branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h 2012-02-19 17:59:30 UTC (rev 44252) @@ -107,6 +107,7 @@ void armature_loc_world_to_pose(struct Object *ob, float *inloc, float *outloc); void armature_mat_pose_to_bone(struct bPoseChannel *pchan, float inmat[][4], float outmat[][4]); void armature_loc_pose_to_bone(struct bPoseChannel *pchan, float *inloc, float *outloc); +void armature_mat_bone_to_pose(struct bPoseChannel *pchan, float inmat[][4], float outmat[][4]); void armature_mat_pose_to_delta(float delta_mat[][4], float pose_mat[][4], float arm_mat[][4]); void armature_mat_pose_to_bone_ex(struct Object *ob, struct bPoseChannel *pchan, float inmat[][4], float outmat[][4]); Modified: branches/bmesh/blender/source/blender/blenkernel/intern/armature.c =================================================================== --- branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2012-02-19 17:55:09 UTC (rev 44251) +++ branches/bmesh/blender/source/blender/blenkernel/intern/armature.c 2012-02-19 17:59:30 UTC (rev 44252) @@ -1302,6 +1302,17 @@ mul_v3_m4v3(outmat[3], loc_mat, inmat[3]); } +/* Convert Bone-Space Matrix to Pose-Space Matrix. */ +void armature_mat_bone_to_pose(bPoseChannel *pchan, float inmat[][4], float outmat[][4]) +{ + float rotscale_mat[4][4], loc_mat[4][4]; + + pchan_to_pose_mat(pchan, rotscale_mat, loc_mat); + + mult_m4_m4m4(outmat, rotscale_mat, inmat); + mul_v3_m4v3(outmat[3], loc_mat, inmat[3]); +} + /* Convert Pose-Space Location to Bone-Space Location * NOTE: this cannot be used to convert to pose-space location of the supplied * pose-channel into its local space (i.e. 'visual'-keyframing) @@ -2405,6 +2416,8 @@ /* Construct the posemat based on PoseChannels, that we do before applying constraints. */ /* pose_mat(b)= pose_mat(b-1) * yoffs(b-1) * d_root(b) * bone_mat(b) * chan_mat(b) */ + armature_mat_bone_to_pose(pchan, pchan->chan_mat, pchan->pose_mat); +#if 0 /* XXX Old code, will remove this later. */ { float rotscale_mat[4][4], loc_mat[4][4]; pchan_to_pose_mat(pchan, rotscale_mat, loc_mat); @@ -2413,6 +2426,7 @@ /* Location. */ mul_v3_m4v3(pchan->pose_mat[3], loc_mat, pchan->chan_mat[3]); } +#endif /* Only rootbones get the cyclic offset (unless user doesn't want that). */ /* XXX That could be a problem for snapping and other "reverse transform" features... */ Modified: branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c =================================================================== --- branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c 2012-02-19 17:55:09 UTC (rev 44251) +++ branches/bmesh/blender/source/blender/blenkernel/intern/seqeffects.c 2012-02-19 17:59:30 UTC (rev 44252) @@ -1697,7 +1697,7 @@ hyp2 = fabsf(angle*x+y+(-(yo-posy*0.5f)-angle*(xo-posx*0.5f)))*wipezone->pythangle; } - hwidth= MIN2(hwidth, fabsf(b3-b1)/2.0f); + hwidth = minf(hwidth, fabsf(b3-b1)/2.0f); if(b2 < b1 && b2 < b3 ){ output = in_band(hwidth,hyp,0,1); Modified: branches/bmesh/blender/source/blender/editors/object/object_edit.c =================================================================== --- branches/bmesh/blender/source/blender/editors/object/object_edit.c 2012-02-19 17:55:09 UTC (rev 44251) +++ branches/bmesh/blender/source/blender/editors/object/object_edit.c 2012-02-19 17:59:30 UTC (rev 44252) @@ -1005,7 +1005,10 @@ * view3d_edit_object_copyattrmenu() and in toolbox.c */ - strcpy(str, "Copy Attributes %t|Location%x1|Rotation%x2|Size%x3|Draw Options%x4|Time Offset%x5|Dupli%x6|Object Color%x31|%l|Mass%x7|Damping%x8|All Physical Attributes%x11|Properties%x9|Logic Bricks%x10|Protected Transform%x29|%l"); + strcpy(str, + "Copy Attributes %t|Location%x1|Rotation%x2|Size%x3|Draw Options%x4|" + "Time Offset%x5|Dupli%x6|Object Color%x31|%l|Mass%x7|Damping%x8|All Physical Attributes%x11|Properties%x9|" + "Logic Bricks%x10|Protected Transform%x29|%l"); strcat (str, "|Object Constraints%x22"); strcat (str, "|NLA Strips%x26"); Modified: branches/bmesh/blender/source/blender/editors/physics/particle_edit.c =================================================================== --- branches/bmesh/blender/source/blender/editors/physics/particle_edit.c 2012-02-19 17:55:09 UTC (rev 44251) +++ branches/bmesh/blender/source/blender/editors/physics/particle_edit.c 2012-02-19 17:59:30 UTC (rev 44252) @@ -3474,7 +3474,7 @@ view3d_operator_needs_opengl(C); selected= (short)count_selected_keys(scene, edit); - dmax = MAX2(fabs(dx), fabs(dy)); + dmax = maxf(fabsf(dx), fabsf(dy)); tot_steps = dmax/(0.2f * brush->size) + 1; dx /= (float)tot_steps; Modified: branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c =================================================================== --- branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c 2012-02-19 17:55:09 UTC (rev 44251) +++ branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c 2012-02-19 17:59:30 UTC (rev 44252) @@ -879,6 +879,7 @@ IMB_anim_index_rebuild(clip->anim, tc_flag, size_flag, quality, stop, do_update, progress); if(!build_undistort_count) { + BKE_movieclip_reload(clip); return; } else { @@ -905,6 +906,8 @@ if(distortion) BKE_tracking_distortion_destroy(distortion); + + BKE_movieclip_reload(clip); } static int clip_rebuild_proxy_exec(bContext *C, wmOperator *UNUSED(op)) 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,43872,44130,44141,44147-44149,44151-44152 /trunk/blender/source/blender/editors/space_outliner:31524-42495,42522-42548,42671-42680,42779-42839,42992-43033,43279-43338,43421-43435,43483-43530,43565-43664,43888-43918,44025-44076,44137-44204 + /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,43872,44130,44141,44147-44149,44151-44152,44229-44230 /trunk/blender/source/blender/editors/space_outliner:31524-42495,42522-42548,42671-42680,42779-42839,42992-43033,43279-43338,43421-43435,43483-43530,43565-43664,43888-43918,44025-44076,44137-44204,44236-44250 Modified: branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c =================================================================== --- branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-02-19 17:55:09 UTC (rev 44251) +++ branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c 2012-02-19 17:59:30 UTC (rev 44252) @@ -1584,7 +1584,7 @@ /* calc window coord */ initgrabz(rv3d, 0.0, 0.0, 0.0); ED_view3d_win_to_delta(ar, mval_f, vec); - fac= MAX3( fabs(vec[0]), fabs(vec[1]), fabs(vec[1]) ); + fac= maxf(fabsf(vec[0]), maxf(fabsf(vec[1]), fabsf(vec[2]))); /* largest abs axis */ fac= 1.0f/fac; asp= ( (float)ibuf->y)/(float)ibuf->x; Modified: branches/bmesh/blender/source/blender/editors/transform/transform.c =================================================================== --- branches/bmesh/blender/source/blender/editors/transform/transform.c 2012-02-19 17:55:09 UTC (rev 44251) +++ branches/bmesh/blender/source/blender/editors/transform/transform.c 2012-02-19 17:59:30 UTC (rev 44252) @@ -4845,7 +4845,8 @@ copy_v3_v3(vec, sv->upvec); mul_v3_fl(vec, perc); add_v3_v3v3(sv->v->co, sv->origvert.co, vec); - } else { + } + else { copy_v3_v3(vec, sv->downvec); mul_v3_fl(vec, -perc); add_v3_v3v3(sv->v->co, sv->origvert.co, vec); Modified: branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c =================================================================== --- branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c 2012-02-19 17:55:09 UTC (rev 44251) +++ branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c 2012-02-19 17:59:30 UTC (rev 44252) @@ -417,7 +417,7 @@ } for(;segcount;segcount--) { Bone *bone; - float rmat[4][4], tmat[4][4], imat[4][4]; + float rmat[4][4]/*, tmat[4][4], imat[4][4]*/; /* pose_mat(b) = pose_mat(b-1) * offs_bone * channel * constraint * IK */ /* we put in channel the entire result of rmat= (channel * constraint * IK) */ @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs