Commit Graph

1195 Commits

Author SHA1 Message Date
Sergey Sharybin
3129072522 Merging r38951 through r38987 from trunk into soc-2011-tomato 2011-08-03 14:02:08 +00:00
Nathan Letwory
dc4b104e60 typo fix. 2011-08-02 23:52:07 +00:00
Mike Erwin
3af9651b90 ndof changes: turned off 3D mouse during transform, removed timing bug in image/uv, added option for zoom axis (up/down vs. forward/backward) 2011-08-02 22:50:06 +00:00
Sergey Sharybin
1694e5978a Merging r38898 through r38940 from trunk into soc-2011-tomato 2011-08-02 17:32:19 +00:00
Nathan Letwory
73fc78c5d8 Debug print removed. 2011-08-02 09:18:21 +00:00
Campbell Barton
70b4758ff8 Made wmNDOFMotionData use a vector rather then xyz members, makes it nicer to use with math functions.
ndof_to_angle_axis and ndof_to_quat now use math functions.
2011-08-02 07:08:22 +00:00
Campbell Barton
ed306416f5 replace WM_OT_ndof_menu with a key->menu assignment. 2011-08-02 06:40:40 +00:00
Campbell Barton
fcd7d2b486 NDOF related edits
- fix for building without NDOF on X11
- quiet some warnings
2011-08-02 05:52:27 +00:00
Mike Erwin
aec91c0cf5 ndof sensitivity operator follows power curve and respects min/max 2011-07-29 21:07:51 +00:00
Sergey Sharybin
feffc920bb Merging r38780 through r38818 from trunk into soc-2011-tomato 2011-07-29 15:18:14 +00:00
Nathan Letwory
24def76ac8 svn merge -r38753:38813 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-29 07:58:03 +00:00
Campbell Barton
2658949752 pep8 cleanup, also print message when attempting to run in animation player mode. 2011-07-29 01:24:03 +00:00
Nathan Letwory
d55f6c64a2 speed button mapping to ndof sensitivity change operator. 2011-07-28 13:44:36 +00:00
Nathan Letwory
73a9ce7ec0 svn merge -r38558:38752 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-27 07:42:53 +00:00
Sergey Sharybin
e92162744b Merging r38704 through r38732 from trunk into soc-2011-tomato 2011-07-26 15:56:53 +00:00
Campbell Barton
06ae122f60 include menu ID's in tooltips when python tips are enabled, there was no way to find the ID of a menu which become annoying if you wanted to reference it from a script. 2011-07-26 09:19:51 +00:00
Mike Erwin
73417bfbb5 spoof MOUSEMOVE after NDOF_MOTION event, added comments 2011-07-25 00:03:07 +00:00
Mike Erwin
ed232c756d ndof overall sensitivity is now live 2011-07-24 00:40:39 +00:00
Mike Erwin
b9f3ff5435 removed ancient ndof global, removed my own attempt at a C popup menu (the Python one works) 2011-07-23 21:55:52 +00:00
Nathan Letwory
1cce0dd505 Prepare for NDOF event handling all the way to keymaps (and keymap editor). 2011-07-21 20:57:23 +00:00
Nathan Letwory
eea7c358c7 svn merge -r37276:38555 https://svn.blender.org/svnroot/bf-blender/trunk/blender . 2011-07-21 09:40:59 +00:00
Sergey Sharybin
b9c6a20354 Merging r38454 through r38515 from trunk into soc-2011-tomato 2011-07-19 19:58:01 +00:00
Mike Erwin
7f74abeaca translated ndof menu from C to Python, enabled helicopter fly mode 2011-07-19 04:12:49 +00:00
Ton Roosendaal
384831dd9d Bugfix #27927
This fixes assigning 'tweak' keymap option for border selecting in
Node editor. Thanks Perry Parks for the patch!
2011-07-18 14:41:59 +00:00
Sergey Sharybin
b18dd20aea Merging r38433 through r38453 from trunk into soc-2011-tomato 2011-07-17 17:25:11 +00:00
Campbell Barton
5792bd7cc7 cmake: cleanup include paths, some duplicates and going up some unneeded dirs. 2011-07-17 09:11:13 +00:00
Campbell Barton
410c5e3cd2 cmake source definitions:
remove missing includes and use more strict formatting.
2011-07-16 23:01:14 +00:00
Mike Erwin
cc1ba4569c more consistent and modal-friendly ndof events, fly mode v1 2011-07-14 21:20:45 +00:00
Sergey Sharybin
ab57128825 Merging r38364 through r38389 from trunk into soc-2011-tomato 2011-07-14 12:04:21 +00:00
Campbell Barton
c3fcd6c4c7 reuse USER_SAVE_PREVIEWS to not save thumbnails into blend file header 2011-07-13 19:16:25 +00:00
Sergey Sharybin
0c802ad23e Merging r38237 through r38264 from trunk into soc-2011-tomato 2011-07-09 17:49:36 +00:00
Nicholas Bishop
abdf420a6d == GPU Buffers ==
This patch attempts to clean up and document the GPU buffers
code. There are a few bug fixes as well.

Patch reviewed here: http://codereview.appspot.com/4631052/

Summary:

* Bugfix: make GPU_buffer_copy_normal convert from shorts to floats
  correctly, also fixed the use of cached face normal CustomData.

* Bugfix: changed the `mat_nr' field of GPUBufferMaterial from char to
  short.

* Changed color buffer setup to not alloc a temporary copy of color
  data, just passes the MCol data in directly.

* Changed the GPU buffer pool code to make clearer what operates
  specifically on the global pool.

* Lots of refactoring for GPU_drawobject_new; should operate mostly
  the same (except got rid of one unecessary allocation), just split
  into more functions and without macros now.

* Converted some #defines into enumerations.

* Made some stuff private, pulled out of header file.

* Deleted unused function GPU_buffer_pool_free_unused().

* Removed GPU_interleaved_setup and related #defines. (I think this
  was used for editmode VBOs, but those were disabled.)

* Added lots of comments.

* Added a few comments in the code signed `--nicholas' to note places
  where I am unsure about design or usage, would be good to address
  these better.

* Code formatting changed to be more consistent with the rest of
  Blender.

* Renamed some fields and variables to be more consistent with
  Blender's naming conventions.

* Renamed some fields and variables to use more descriptive names,
  e.g. renamed `redir' to `mat_orig_to_new'.

* Removed print outs with DEBUG_VBO -- don't feel too strongly about
  this one, just not used elsewhere in Blender, could be easily added
  back if others disagree though.

* Moved the PBVH drawing code down to the bottom of the file, before
  was sitting in the middle of the other VBO code
2011-07-08 19:58:02 +00:00
Sergey Sharybin
ef5110a033 Merging r38036 through r38196 from trunk into soc-2011-tomato 2011-07-07 17:48:22 +00:00
Nathan Letwory
cf43e48fc7 Apply patch 4636051. COLLADA: Export selection.
Original patch by Jan Diederich, adapted by Pelle Johnsen. Review assistance by Daniel Tavares.

This patch adds an option to export only the selection.
2011-07-04 08:59:28 +00:00
Campbell Barton
0e0eba9f79 fix for crash when setting layers or saving when there is no active scene - only really happens when running python scripts on startup. 2011-07-04 05:23:36 +00:00
Mike Erwin
14c72f379c implemented ndof 'dead zone' around home position, fixed X11 active window determination, removed old X11 ndof code 2011-07-01 21:51:44 +00:00
Mike Erwin
20de4f27b6 ndof popup menu (experimental (mostly harmless)) 2011-07-01 01:00:20 +00:00
Sergey Sharybin
70eb9e85c5 Merging r37732 through r37862 from trunk into soc-2011-tomato 2011-06-27 14:20:48 +00:00
Ton Roosendaal
f10f3d3651 Bugfix #27768
On clicking in a non-active Blender window (when you activated others),
the mouse position of the first click was still the old position.

Problem is in GHOST; it sends out the 'activate window' event after the
mouseclick event itself. Code now checks for this case and reads the
correct mouse position.
2011-06-27 11:21:25 +00:00
Mike Erwin
651df035f7 baby steps toward an NDOF popup menu 2011-06-25 18:50:03 +00:00
Ton Roosendaal
08cf05d8d5 Bugfix #27765
Thumbnail save for .blend crashed, when being in editmode for a mesh
that has other object users as well. Derivedmesh confusement...

Thanks to Sergey for finding the cause!
2011-06-25 15:54:20 +00:00
Campbell Barton
12e02fd474 own patch [#27752] Python Callback (Scriptlink functionality)
Python:
 * adds bpy.app.handlers which contains lists, each for an event type:
   render_pre, render_post, load_pre, load_post, save_pre, save_post
 * each list item needs to be a callable object which takes 1 argument (the ID).
 * callbacks are cleared on file load.

Example:
 def MyFunc(scene): print("Callback:", data)
 bpy.app.handlers.render_post.append(MyFunc)

C:
 * This patch adds a generic C callback api which is currently only used by python.
 * Unlike python callbacks these are not cleared on file load.
2011-06-24 16:54:30 +00:00
Brecht Van Lommel
c518aa1383 GHOST Cocoa: move y origin top/bottom conversions out of windowmanager module
and into GHOST. Also fixes a problem where e.g. the user preferences window
would not open under the mouse cursor correctly.
2011-06-23 19:55:47 +00:00
Sergey Sharybin
9f769c43a3 Merging r37594 through r37703 from trunk into soc-2011-tomato 2011-06-21 18:24:00 +00:00
Thomas Dinges
ed3dadf489 Blender 2.58 release preparations:
* Update of Release Log Links to point to: http://www.blender.org/development/release-logs/blender-258/
2011-06-20 20:21:52 +00:00
Mike Erwin
e46e2d9d54 resolved collision among WM event types, ndof no longer encroaches on keyboard turf 2011-06-18 20:30:09 +00:00
Campbell Barton
968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +00:00
Sergey Sharybin
f4ce5770ca Merging r37518 through r37593 from trunk into soc-2011-tomato 2011-06-17 14:41:44 +00:00
Campbell Barton
68a12c74b6 fix [#26621] Memory leaks when creating popup window.
also fixes memory leak when cancelling a popup dialog (new image for example).
2011-06-17 12:48:33 +00:00
Mike Erwin
18b5dac5ca Standard views (front, top, etc.) work from buttons on SpaceExplorer and SpacePilotPro. Linux can now determine which NDOF device is plugged in. 2011-06-16 19:45:38 +00:00