Daniel Genrich
24a00f14af
Fix compile errors on VC++ 2012 RC1.
...
Note: Compile still fails during ceres compile (namespace tr1 problems).
2012-07-27 18:18:13 +00:00
Sergey Sharybin
718569dc16
Fix #32199 : Smooth Vertex no longer has X, Y and Z options.
2012-07-27 17:35:02 +00:00
Sergey Sharybin
990466e87e
Initial support for numpy in scons
...
Assumes numpy is installed to the BF_PYTHON/site-packages/numpy directory,
could be tweaked further, but this should be enough to setup release
building environment.
Seems blender can't import numpy, but that doesn't seem to be scons issue,
the same happens here with cmake too. Would ask Campbell to help looking
into this.
2012-07-27 16:01:33 +00:00
Campbell Barton
f1acd6ac3e
code cleanup: pass mouse position as int[2] rather then wmEvent
2012-07-27 15:15:55 +00:00
Sergey Sharybin
87a1d2935a
Merging r49287 through r49299 from trunk into soc-2011-tomato
2012-07-27 15:12:58 +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
Campbell Barton
409a6ee57b
use B key to toggle 'boundary' option for modal inset.
2012-07-27 14:17:05 +00:00
Campbell Barton
7b4733f422
fix usercount error with dropping images in the node view.
2012-07-27 13:57:03 +00:00
Sergey Sharybin
f230a94d49
Fix crash in drawing socket names when zooming out a lot
...
--
svn merge -r49291:49292 ^/branches/soc-2011-tomato
2012-07-27 13:49:55 +00:00
Sergey Sharybin
abeeebd089
Display solver keyframes in cache line
...
--
svn merge -r49293:49294 ^/branches/soc-2011-tomato
2012-07-27 13:49:26 +00:00
Sergey Sharybin
0471ffe9a4
Display solver keyframes in cache line
2012-07-27 13:48:23 +00:00
Campbell Barton
d623454d2e
add missing image/mask restore call when undo'ing
2012-07-27 13:24:08 +00:00
Sergey Sharybin
19bf60c54a
Fix crash in drawing socket names when zooming out a lot
2012-07-27 13:16:04 +00:00
Sergey Sharybin
5e90606b17
Tomato Cycles: fix for wrong resolution used for rendering Render Layer node
...
Issue was caused by Cycles using render options from rendering scene, not
from active scene.
For now solved by passing render resolution inside RenderEngine structure.
This probably could be solved in more general way, like adding bindings
for RenderEngine->Render, which would avoid passing options like
is_animation, came_override and so via RenderEngine. Would think about
this a bit more and probably would do that.
The same issue happens in trunk as well, but not consider such a change
trunk-ready, would want to make more tests and probably clean the code
a little bit before commiting this into trunk.
2012-07-27 12:16:23 +00:00
Campbell Barton
bef3be5326
code cleanup: mask keys now dont use space-clip keys - could give troubles later on.
2012-07-27 11:56:36 +00:00
Sergey Sharybin
a63ffa9ae3
Merging r49281 through r49286 from trunk into soc-2011-tomato
2012-07-27 11:07:55 +00:00
Sergey Sharybin
18e874798d
Track input node: more control on over output value
...
Now supports output value of:
- Absolute marker position
- Marker position relative to the very first marker
- Marker position relative to given scene frame
2012-07-27 11:07:12 +00:00
Sergey Sharybin
d0b387a0df
Track input node: move all initializaiton to initExecution function
2012-07-27 11:07:09 +00:00
Campbell Barton
9a2d862123
clamp mask resolution, the occasional crash would happen failing to alloc when adding feather points very close together.
2012-07-27 11:05:08 +00:00
Campbell Barton
915fdd67df
up/down arrows were not switching mask keyframes in the image space
2012-07-27 10:55:24 +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
fc0bf22186
svn merge ^/trunk/blender -r49263:49280
2012-07-27 10:27:28 +00:00
Campbell Barton
b8d96bc011
mask motion blur shutter option
2012-07-27 10:20:36 +00:00
Sergey Sharybin
52aa7a4a4c
Added utility function to return marker's subframe position
...
Used in mask parenting stuff.
2012-07-27 10:12:58 +00:00
Campbell Barton
b10a35a9a9
motion blur for mask node:
...
TODO
- add shutter speed option
- add blur option
2012-07-27 09:32:47 +00:00
Sergey Sharybin
93c29aaeb1
Fix #32187 : OpenGL preview does not take into account overwrite option
2012-07-27 08:58:34 +00:00
Campbell Barton
1543a713a8
copying a mask now copies its animation data too
2012-07-27 08:36:48 +00:00
Campbell Barton
c42b23030b
copy support for mask datablocks
2012-07-27 08:18:11 +00:00
Campbell Barton
61469d2e3e
code cleanup: remove unneeded 'struct' qualifiers
2012-07-26 22:47:05 +00:00
Campbell Barton
ff078d309e
change clip utility function arguments to take space data and region rather then the context.
...
this allows a fix to be applied that corrects the helper line in the image view when transforming a mask.
2012-07-26 22:41:40 +00:00
Campbell Barton
ee572a9642
code cleanup: minor edits for mask/transform
2012-07-26 21:22:42 +00:00
Sergey Sharybin
f6b542aeb2
Merging r49261 through r49263 from trunk into soc-2011-tomato
2012-07-26 18:05:42 +00:00
Sergey Sharybin
85571c339d
Fix unworkable track position node
2012-07-26 18:05:05 +00:00
Campbell Barton
4c2de5e0c7
fix some types and incorrect info
2012-07-26 17:41:09 +00:00
Campbell Barton
ae5fc40a63
svn merge ^/trunk/blender -r49256:49260
2012-07-26 17:15:28 +00:00
Campbell Barton
7f1a76887f
workaround for depsgraph update issue with booleans.
2012-07-26 17:14:23 +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
Campbell Barton
0c1ea14656
fix for crash when displaying the tooltip for a non python menu (was introduced with recent translation/ui edits)
2012-07-26 16:55:34 +00:00
Sergey Sharybin
9325546c11
Merging r49255 through r49256 from trunk into soc-2011-tomato
2012-07-26 16:12:41 +00:00
Sergey Sharybin
4bfef9a443
Display animation data from lamps' node trees in animation editor windows
2012-07-26 16:11:59 +00:00
Sergey Sharybin
e35d1ee8b8
Merging r49253 through r49254 from trunk into soc-2011-tomato
2012-07-26 15:51:33 +00:00
Sergey Sharybin
fb520785b6
Run versioning stuff for animation summary color again
...
Seems it was messed up at some point or changes weren't applied
synchronized, which lead to lots of files with wrong color used.
2012-07-26 15:50:45 +00:00
Campbell Barton
0ca416424b
svn merge ^/trunk/blender -r49250:49252
2012-07-26 13:42:33 +00:00
Campbell Barton
0df907c4e2
fix for crash when checking for locked action.
2012-07-26 13:40:48 +00:00
Campbell Barton
e27f56d388
svn merge ^/trunk/blender -r49244:49250
2012-07-26 13:30:37 +00:00
Campbell Barton
733edf8628
option to use manual size input for scene
2012-07-26 13:29:38 +00:00
Sergey Sharybin
2b8fdedaf3
Fix #31897 : Ctrl+Click in 'Hue Correct' Node Adds in Wrong Location
...
Misusage of X/Y coords, ancient one!
2012-07-26 12:04:11 +00:00
Campbell Barton
f39a21c36f
add ED_space_image_get_size_fl, ED_space_clip_get_size_fl
2012-07-26 11:47:47 +00:00
Lukas Toenne
fec872ef9c
Added a particle index output to the Particle Info Cycles node. This is required to get consistent ID numbers for particles. The Object ID is not usable since it's a user defined value of the instanced object, which does not vary per instance. Also the random value from the object info node is not consistent over time, since it only depends on the index in the dupli list (so each emitted or dying particle shifts the value).
...
The particle index is always the same for a specific particle. Randomized values can be generated from this with the use of a noise texture.
2012-07-26 11:40:58 +00:00
Jens Verwiebe
53a861b6f9
OSX/scons: fix compiling on the new OSX 10.8 (Mountain Lion) with delivered Xcode 4.4
2012-07-26 11:08:56 +00:00
