[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50779] trunk/blender/source/blender: fix [#32602] Bevel operator's transform input is inverted

Campbell Barton ideasman42 at gmail.com
Thu Sep 20 14:42:23 CEST 2012


Revision: 50779
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50779
Author:   campbellbarton
Date:     2012-09-20 12:42:22 +0000 (Thu, 20 Sep 2012)
Log Message:
-----------
fix [#32602] Bevel operator's transform input is inverted
inset was inverted also

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/sound.c
    trunk/blender/source/blender/editors/mesh/editmesh_tools.c

Modified: trunk/blender/source/blender/blenkernel/intern/sound.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sound.c	2012-09-20 12:29:28 UTC (rev 50778)
+++ trunk/blender/source/blender/blenkernel/intern/sound.c	2012-09-20 12:42:22 UTC (rev 50779)
@@ -792,7 +792,6 @@
 void sound_seek_scene(struct Main *UNUSED(bmain), struct Scene *UNUSED(scene)) {}
 float sound_sync_scene(struct Scene *UNUSED(scene)) { return NAN_FLT; }
 int sound_scene_playing(struct Scene *UNUSED(scene)) { return -1; }
-int sound_read_sound_buffer(struct bSound *UNUSED(sound), float *UNUSED(buffer), int UNUSED(length), float UNUSED(start), float UNUSED(end)) { return 0; }
 void sound_read_waveform(struct bSound *sound) { (void)sound; }
 void sound_init_main(struct Main *bmain) { (void)bmain; }
 void sound_set_cfra(int cfra) { (void)cfra; }

Modified: trunk/blender/source/blender/editors/mesh/editmesh_tools.c
===================================================================
--- trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-09-20 12:29:28 UTC (rev 50778)
+++ trunk/blender/source/blender/editors/mesh/editmesh_tools.c	2012-09-20 12:42:22 UTC (rev 50779)
@@ -4710,7 +4710,7 @@
 				mdiff[0] = opdata->mcenter[0] - event->mval[0];
 				mdiff[1] = opdata->mcenter[1] - event->mval[1];
 
-				factor = -len_v2(mdiff) / opdata->initial_length + 1.0f;
+				factor = opdata->initial_length / -len_v2(mdiff) + 1.0f;
 
 				/* Fake shift-transform... */
 				if (event->shift) {
@@ -5074,9 +5074,9 @@
 				mdiff[1] = opdata->mcenter[1] - event->mval[1];
 
 				if (opdata->modify_depth)
-					amount = opdata->old_depth + len_v2(mdiff) / opdata->initial_length - 1.0f;
+					amount = opdata->old_depth + opdata->initial_length / len_v2(mdiff) - 1.0f;
 				else
-					amount = opdata->old_thickness - len_v2(mdiff) / opdata->initial_length + 1.0f;
+					amount = opdata->old_thickness - opdata->initial_length / len_v2(mdiff) + 1.0f;
 
 				/* Fake shift-transform... */
 				if (opdata->shift)




More information about the Bf-blender-cvs mailing list