Commit Graph

49420 Commits

Author SHA1 Message Date
Ove Murberg Henriksen
30085e5ea9 response to code review:
http://codereview.appspot.com/6301100/diff/1/source/blender/editors/object/object_vgroup.c
2012-07-04 16:30:12 +00:00
Ove Murberg Henriksen
d43e1fa7be svn merge ^/trunk/blender -r48095:48592 2012-07-04 15:56:42 +00:00
Bastien Montagne
4149ea5f50 Last spell checking (for now).
Only mysterious courant from bpy.types.ParticleSettings.courant_target reamins...
2012-07-04 15:52:07 +00:00
Bastien Montagne
558721ab59 More spell checking. 2012-07-04 15:04:38 +00:00
Campbell Barton
715edceb42 spelling cleanup: metre -> er 2012-07-04 12:56:58 +00:00
Campbell Barton
438b77e5d4 fix for building with windows. 2012-07-04 12:36:43 +00:00
Jeroen Bakker
7cde835c2e relay the original node to a different place holder to resolve some
crashes.
2012-07-04 12:30:17 +00:00
Bastien Montagne
4d2a6a8e21 Spellfixes: colour -> color 2012-07-04 12:19:50 +00:00
Campbell Barton
fbc24a61c4 svn merge ^/trunk/blender -r48576:48585 2012-07-04 11:53:48 +00:00
Jeroen Bakker
778999cbbf Two pass execution:
1. first pass only fast nodes are calculated and only to the active
viewer node
2. second pass all nodes to all outputs

Temp disabled highlights because of random crashes.
2012-07-04 11:39:28 +00:00
Jeroen Bakker
33e12a2983 Highlight nodes that are being processed 2012-07-04 10:01:45 +00:00
Sergey Sharybin
e34f28f81c Style cleanup, no functional changes 2012-07-04 09:08:05 +00:00
Sergey Sharybin
ebdd2201ff Merging r48575 through r48576 from trunk into soc-2011-tomato 2012-07-04 07:37:21 +00:00
Bastien Montagne
592196cb70 Revert the DNA pdef_stickness -> pdef_stickiness part of r48556.
Forgot DNA needed stable names... :/ Correct spelling would involve keeping the old one for load code anyway, so better live with incorrect spelling here.
2012-07-04 07:35:54 +00:00
Sergey Sharybin
17d7a9c3d9 Merging r48545 through r48574 from trunk into soc-2011-tomato 2012-07-04 07:33:34 +00:00
Sergey Sharybin
facc2429ab Mask node: create a copy of layers to be rasterized in initExecution
This creates a list of splines to be rasterized in nitExecution which
is being called from main thread. This should resolve possible threading
issues discovered in tomato branch.
2012-07-04 07:10:23 +00:00
Campbell Barton
e505ab8ad2 add support for scrubbing with the mouse 2012-07-03 22:58:43 +00:00
Campbell Barton
c1493432a3 most keyboard events working again, but no scrub 2012-07-03 22:10:59 +00:00
Campbell Barton
81a509fa40 fix error in node template and quiet warning. 2012-07-03 21:03:39 +00:00
Jens Verwiebe
223cdefbf5 make the last fix unhackish 2012-07-03 19:40:01 +00:00
Bastien Montagne
468ef74ed7 More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize). 2012-07-03 19:09:07 +00:00
Jens Verwiebe
d8f9a2c45f some fixes and a hack to get osx with ocio compiled, todo: also add the missing libs 2012-07-03 19:03:52 +00:00
Bastien Montagne
37dc4006c7 First load of spell and typo fixes (mostly UI messages, but also one or two pieces of code using mis-spelled names). 2012-07-03 17:20:21 +00:00
Sergey Sharybin
9ac9040cfd Tomato: skip cache for Movieclip input node only when rendering 2012-07-03 16:23:15 +00:00
Sergey Sharybin
f56f492c5a Tomato experimental option: disable cacheing for movie clip node 2012-07-03 16:18:39 +00:00
Sergey Sharybin
bc78942be0 Also fix Anim Player button for node editor 2012-07-03 16:04:26 +00:00
Sergey Sharybin
1b556dcb51 Tomato: fixed crash caused by interaction between color management and
movie clip caches resulting in some unchecked NULL pointers.

Probably it'll be better to separate memory limitors for cache and
clips or double-check priority functions are fine to deal with
such cases.
2012-07-03 16:00:57 +00:00
Sergey Sharybin
89af953a65 Tomato: correction to mask cache so parenting should work fine now 2012-07-03 15:46:23 +00:00
Sergey Sharybin
62541003bf Merging r48538 through r48544 from trunk into soc-2011-tomato 2012-07-03 15:14:14 +00:00
Sergey Sharybin
06b797033a Fix #32002: "Anim Player" button on header doesn't appear 2012-07-03 15:01:54 +00:00
Sergey Sharybin
3f91437329 Corrections to default values for view settings 2012-07-03 14:51:54 +00:00
Sergey Sharybin
d51297421d Tomato: hack to cache result of rasterization
It shall be removed as soon as tile-based rasterization is here,
but to remove current stoppers should be fine.
2012-07-03 14:30:55 +00:00
Campbell Barton
2e3c474b2d image sequence - apply cyclic option AFTER the image offset,
there was no way to properly loop on a sequence of images that didnt start frame 1.
2012-07-03 14:25:06 +00:00
Campbell Barton
1fb0ecb9bb svn merge ^/trunk/blender -r48527:48537 2012-07-03 14:05:18 +00:00
Campbell Barton
42aaa47e9b dont display image sequences outside the frame range in the 3D viewport. 2012-07-03 14:04:39 +00:00
Joshua Leung
44ca0a4328 Fix for the "black F-Curves" bug on undo
(From personal stash of bugs - since early 2.5 versions)

F-Curve colors get applied only on Graph Editor "refresh()". In some cases, undo
was reverting back to a state where the colors had not yet been set. In these
cases, there would be no refresh() after that undo (until expanding a channel or
some other similar action), resulting in "black F-Curves" appearing. So, now we
force such an update after undo to ensure that the curves never display black.

(Noticed while investigating another bug for Mango related to
CLIP_OT_constraint_to_fcurve not sending notifiers required when new F-Curves
are added)
2012-07-03 13:47:13 +00:00
Bastien Montagne
971ffd8fad Fix [#31977] Export Animated Mesh, terminate baking in fluid-sim
* Elbeem exporter code now overrides user settings to No Slip in case the object is animated;
* UI of fluid obstacles now disables slip settings when export animated is enabled;
* Added in this later option's tooltip a mention that it enforces No Slip!
2012-07-03 12:40:19 +00:00
Campbell Barton
259e78997a svn merge ^/trunk/blender -r48489:48527 2012-07-03 11:03:39 +00:00
Sergey Sharybin
5c70c29b9c Tomato: improved cache management for movie clips
Replace pseudo-LRU approach of determining which buffer
to remove when running out of space allowed for cache
with approach which would remove the frame which is most
far away from newly added frame.

This is still a bit tricky because it's impossible to
distinguish which frame to delete in situation of:

    CCCC...CC
        ^

it's either user wants to extend left segment of cached
frames and buffers from right segment should be removed
or he wants to join this two segments and in that case
buffers from right segment should be removed.

Would need a bit more investigation which situation
is more common in general usecase.
2012-07-03 10:56:33 +00:00
Campbell Barton
314a275850 fix (actually nasty workaround), for groups incorrectly drawing in the object panel when the blend file has naming collisions with library data.
also minor style cleanup in bpy_rna.c
2012-07-03 10:32:10 +00:00
Jeroen Bakker
2f5735a9d4 Optimized the area of interest of the lensdistortion node.
This will have faster feedback to the user, as lensdistortion is mostly
a node that is located at the end of a composite
2012-07-03 09:05:19 +00:00
Jeroen Bakker
a0a4c54710 Check for nullpointers.
The ID of group nodes are not always filled.
2012-07-03 08:54:07 +00:00
Campbell Barton
55027b8232 fix for memory leak in BKE_mesh_ensure_navmesh(), it would add 2 navmesh layers, once referencing the other. 2012-07-03 08:16:14 +00:00
Joshua Leung
6a2a424c40 Bugfix: Fix crashes with empty material slots 2012-07-03 05:46:44 +00:00
Joshua Leung
d58cb1beaa Followup for r.48515
* Removed material driver creation hack. However, the textures one remains, as
texture eval isn't ready yet
* Shuffled some code
2012-07-03 05:30:19 +00:00
Joshua Leung
c960d1692f Bugfix [#31834] Cycles materials cannot be manipulated using drivers
Until now, there was never any code for making drivers on materials get
recalculated when their dependencies were changed. However, since changing
material colors with drivers is something that is quite common, a workaround was
introduced to ensure that materials could still be driven (albeit with the
relevant drivers rooted at object level). This worked well enough so far with
traditional materials - though it was sometimes clunky and confusing for some
users - and would have been ok to tide us over until the depsgraph refactor.

The introduction of Cycles changed this, as it has in many other ways. Now that
people use Cycles to render, they'll need to drive the material colors through
the nested nodetree (and other things nested deeply within that). However, this
is much more difficult to generate hacks to create the relevant paths needed to
work around the problem.

== This Commit... ==
* Adds a recursive driver calculation step to the BKE_object_handle_update()
(which gets called whenever the depsgraph has finished tagging object datablocks
for updates), which goes through calculating the drivers attached to the object
(and the materials/nodetrees attached to that). This case gets handled everytime
the object is tagged as needing updates to its "data" (OB_RECALC_DATA)

* When building the depsgraph, every dependency that the drivers there have are
treated as if they were attached to object.data instead. This should trick the
depsgraph into tagging OB_RECALC_DATA to force recalculation of drivers, at the
expense perhaps of modifiers getting recalculated again.

== Todo ==
* The old workarounds noted are still in place (will be commented out in the
next commit). This fix renders at least the material case redundant, although
the textures case still needs a bit more work.

* Check on whether similar hacks can be done for other datablock combinations

* So far, only simple test cases have been tested. There is probably some
performance penalty for heavy setups still (due to need to traverse down all
parts of material/node hierarchy to find things that need updates). If there
really is a problem here, we could try introducing some tags to limit this
traversal (which get added at depsgraph build time).  <--- USER TESTING
NEEDED!!!
2012-07-03 05:11:37 +00:00
Joshua Leung
f977da407b Bugfix [#31976] Bone Group Custom color set is not respected when creating an
Action

Custom color set colors were not getting copied over when creating new action
groups. Instead, a "default set" was initialised for use instead.
2012-07-03 01:15:03 +00:00
Tamito Kajiyama
98a7ca61fa Merged changes in the trunk up to revision 48505. 2012-07-03 00:02:45 +00:00
Campbell Barton
5593100b35 basic events quit and resize window now work
text draws again.
2012-07-02 23:01:04 +00:00
Tamito Kajiyama
4e39a854b4 Fix for Stroke::Resample() in combination with the previous commit. 2012-07-02 21:49:19 +00:00