griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,868 Commits 1 Branch 0 Tags
63b1e79577fedbe850d28a2c3067f2d4e3addbda
Commit Graph

1715 Commits

Author SHA1 Message Date
Sergey Sharybin
21e403e546 Merging r49953 through r50015 into from trunk into soc-2011-tomato 2012-08-19 13:57:55 +00:00
Sergey Sharybin
adec7cdea2 Patch #32326: NDOF support of rotation and panning the view at the same time 
Additional changes:
- Option to the ndof menu letting you pick turntable/trackball independently
  of the mouse viewport navigation style
- Option to change the rotation sensitivity separate from the panning

Holding shift + moving the ndof does just as before locking it to panning
Holding ctrl + moving will lock it to only rotation

Patch by Fredrik Hansson, thanks!

Reviewed by self and Mike Erwin.
 2012-08-19 13:52:36 +00:00
Sergey Sharybin
6f233e1b91 Merging r49920 through r49929 from trunk into soc-2011-tomato 2012-08-16 08:36:26 +00:00
Campbell Barton
86a69c5028 dont re-use previous values for link/append operator, would get mixed up with when accessing from a key shortcut. 2012-08-15 11:53:49 +00:00
Campbell Barton
edf617a349 svn merge ^/trunk/blender -r49917:49919 2012-08-15 11:32:56 +00:00
Campbell Barton
60915c9099 escape key now quits composite. 2012-08-15 11:31:04 +00:00
Campbell Barton
f82b93b2c5 svn merge ^/trunk/blender -r49890:49917 2012-08-15 10:36:31 +00:00
Campbell Barton
d4a3828630 code cleanup: use TRUE/FALSE for wm jobs 2012-08-15 10:12:41 +00:00
Campbell Barton
15bd03f958 fix for missing change to fluidsim from last commit and name jobs a more useful name - 'wm_job'. 2012-08-15 10:03:29 +00:00
Campbell Barton
97859e8709 add wm job types they are not used yet, so this just defines them for new jobs add add argument to search by job type. 2012-08-15 09:42:06 +00:00
Campbell Barton
f1537c64a5 svn merge ^/trunk/blender -r49867:49886 2012-08-14 11:07:42 +00:00
Campbell Barton
ca7d1ec39d style cleanup: use <pre> for doxygen ascii art 2012-08-13 15:17:15 +00:00
Campbell Barton
39945fedf3 minor edits to r49870 2012-08-13 11:01:27 +00:00
Jeroen Bakker
e28fcec042 Fix for [#32220] regression - DistortionCache is never freed. 
* at max 10 cache items will be available. Items will be removed by
latest usage.
 * number of cached items can be adjusted in code
 * added deinitialization of compositor when blender exists.
 * updated scons and cmake build files
 2012-08-13 10:56:36 +00:00
Campbell Barton
41b0ec6c94 svn merge ^/trunk/blender -r49854:49867 2012-08-13 09:35:11 +00:00
Campbell Barton
cfb160c764 style cleanup 2012-08-12 21:46:35 +00:00
Sergey Sharybin
8aeba8ec8b Merging r49815 through r49833 from trunk into soc-2011-tomato 2012-08-12 10:07:55 +00:00
Campbell Barton
b96c622015 style cleanup 2012-08-11 22:12:32 +00:00
Campbell Barton
c567cf3fab code cleanup: WM naming conventions 2012-08-11 21:35:24 +00:00
Sergey Sharybin
00afee41c8 Merging r49775 through r49807 from trunk into soc-2011-tomato 2012-08-11 14:39:09 +00:00
Campbell Barton
fdc5e4f5a6 docs for window structs 2012-08-11 01:05:09 +00:00
Sergey Sharybin
2e30bf28c1 Merging r49711 through r49737 from trunk into soc-2011-tomato 2012-08-09 17:03:33 +00:00
Campbell Barton
5e0f254afa utility functions for getting/setting rectangles for operators. 2012-08-08 20:38:55 +00:00
Campbell Barton
f0951f58ca code cleanup: rename G.afbreek --> is_break, G.rendering --> is_rendering 2012-08-08 18:37:06 +00:00
Campbell Barton
0b5a995cfd code cleanup: rename G.rt to G.debug_value 2012-08-08 18:21:54 +00:00
Sergey Sharybin
5ad7ab03e3 Merging r49681 through r49707 from trunk into soc-2011-tomato 2012-08-08 16:48:05 +00:00
Sergey Sharybin
1bf893e9c8 Code cleanup: BKE_ prefix for public sequencer functions 2012-08-08 11:15:40 +00:00
Campbell Barton
db6c4ba11e bring back the play option from 2.4x 2012-08-06 16:07:11 +00:00
Campbell Barton
cc1af6bb36 fix for memory leak playing animations. 2012-08-06 15:54:52 +00:00
Campbell Barton
77610e1550 svn merge ^/trunk/blender -r49573:49601 2012-08-06 09:33:43 +00:00
Campbell Barton
5bb97305a4 fix for node clipboard leak on exit, also use blenders convention for function naming with BKE clipboard funcs. 2012-08-06 08:25:24 +00:00
Campbell Barton
887d517e3b use define for 0.375 = GLA_PIXEL_OFS, used all over the interface. 
also use M_SQRT1_2 in math_rotation.c
 2012-08-05 17:27:52 +00:00
Sergey Sharybin
cae3dbd141 Merging r49534 through r49573 from trunk into soc-2011-tomato 2012-08-05 12:54:39 +00:00
Campbell Barton
97e9659c53 style cleanup 2012-08-04 12:54:27 +00:00
Campbell Barton
9ff4fa6671 style cleanup 2012-08-04 12:30:16 +00:00
Campbell Barton
6972e19fd5 code cleanup: 
- replace (strcmp(vfont->name, FO_BUILTIN_NAME) == 0)  with  (BKE_vfont_is_builtin(vfont)).
- reduce some double promotions.
 2012-08-03 22:12:57 +00:00
Campbell Barton
82158b7c34 svn merge ^/trunk/blender -r49531:49533 2012-08-03 15:05:20 +00:00
Campbell Barton
173b998735 fix/edits to vector font handling 
- don't overwrite the font path with "<builtin>" when the font file cant be found, it caused bad problems when loading files on someone elses systems when paths couldn't be found blender would silently clobber paths (tsk tsk).

- when fonts are freed their temp data is now freed too.

- assigning a new filepath to a font now refreshes the object data.
 2012-08-03 15:03:40 +00:00
Sergey Sharybin
3f5e3ae0bf Merging r49413 through r49450 from trunk into soc-2011-tomato 2012-08-01 14:14:22 +00:00
Campbell Barton
179d00fb9c make node select_all consistent with other select operators, also add Ctrl+I, select inverse to node space. 2012-08-01 13:28:19 +00:00
Campbell Barton
0fee289551 style cleanup: >120 line length 2012-08-01 10:44:55 +00:00
Sergey Sharybin
9811e847ca Fix #32209: Autosave ignores multires sculpting 
Use a bit different fix, which gets active scene from context and
uses this scene to figure out active object instead of itterating
through all the objects.
 2012-08-01 09:04:40 +00:00
Campbell Barton
a199ae5368 style cleanup: whitespace, also add '?' to save over popup since it wasnt totally clear it was a question (user pointed this out, they thought it was just notification and lost their work). 2012-07-31 23:06:12 +00:00
Campbell Barton
a70a48814e fix [#32232] Running script that changes area.type crashes blender. 
(reported the bug to keep some reference to the script that crashes).
 2012-07-31 22:15:54 +00:00
Sergey Sharybin
49e0c832e1 Move sRGB conversion initialization to init_exit routines 
It was a threading issue in color management project which potentially
could happen in trunk as well.
 2012-07-27 14:53:57 +00:00
Sergey Sharybin
a63ffa9ae3 Merging r49281 through r49286 from trunk into soc-2011-tomato 2012-07-27 11:07:55 +00:00
Jason Wilkins
6926e924c0 GetStdHandle may return NULL, which isn't really an error, or INVALID_HANDLE_VALUE which does indicate an error, but both should be checked. 2012-07-27 10:48:33 +00:00
Campbell Barton
ae5fc40a63 svn merge ^/trunk/blender -r49256:49260 2012-07-26 17:15:28 +00:00
Jason Wilkins
6b3b7465b6 On windows with --debug flag, change "Press enter key to exit..." to "Press any key to exit . . .". This is implemented by the new function wait_for_console_key. 2012-07-26 16:56:09 +00:00
Sergey Sharybin
0051d24b23 Merging r49191 through r49211 from trunk into soc-2011-tomato 2012-07-25 15:07:47 +00:00