Commit Graph

40542 Commits

Author SHA1 Message Date
Sergey Sharybin
cae3dbd141 Merging r49534 through r49573 from trunk into soc-2011-tomato 2012-08-05 12:54:39 +00:00
Gaia Clary
aff4c781eb COLLADA: #29058 Fixed crash when illegal reference to non existing camera object is found. And report a warning to the console) 2012-08-05 10:23:34 +00:00
Sergey Sharybin
ca382a8d2a Fix for keying screen incorrect memory write when some of tracks are disabled. 2012-08-05 09:31:48 +00:00
Bastien Montagne
9be74a514b Fix [#32260] 'Select Sharp Edges' works vice versa
We want to select edges sharpest than the given threshold, i.e. which faces’s angle is below the limit! Looks like BMesh switched this somehow...
2012-08-05 07:50:51 +00:00
Mitchell Stokes
a71fcd6a13 BGE: Fixing a NULL pointer exception caused by calling KX_Scene.active_camera when there is no camera in the scene. 2012-08-05 07:01:08 +00:00
Gaia Clary
9090340175 COLLADA: fix for #32251. This seems to be compliant to the Collada 1.4.1 specification. 2012-08-04 22:18:56 +00:00
Gaia Clary
021dd5fb40 COLLADA: added initial support for ymag and yfov in importer. fixes issue #32237 2012-08-04 21:25:19 +00:00
Campbell Barton
7cfe6e0fda fix a glitch where overlapping feathering could give random bad pixels, this was caused by feather edge going in a different direction to the mask edge - creating bowtie quads. 2012-08-04 21:04:26 +00:00
Thomas Dinges
ab1badf9a2 Windows MSVC libraries:
* Some refactor, use set_lib_path macro again, which simplifies the code a bit.
2012-08-04 20:25:04 +00:00
Campbell Barton
2044b62370 resolve some issues with curve resolution calculaction
- resolution could become so high that it would wrap around  to a negative number, now check for small numbers before doing float division.
- resolution was being calculated in some cases when it already met the clamp value - now this is skipped.
2012-08-04 20:17:22 +00:00
Campbell Barton
3d20474414 style cleanup 2012-08-04 19:34:38 +00:00
Campbell Barton
97e9659c53 style cleanup 2012-08-04 12:54:27 +00:00
Thomas Dinges
e0234cc821 Cmake / Windows Libraries:
* Some more fixes for OpenEXR, works now (tested with cv2008 x64 and x32)
* Some more changes to have libs in lib/win*/libname/vc2010 folder. Commit to libs itself to change that will follow.
2012-08-04 12:43:45 +00:00
Campbell Barton
9ff4fa6671 style cleanup 2012-08-04 12:30:16 +00:00
Thomas Dinges
2390c95cf1 Code cleanup:
* Remove BSP_GhostTest, not used and working for ages, approved by Sergey.
2012-08-04 11:42:38 +00:00
Thomas Dinges
f50bae3259 Revert part of r49504 by Genscher:
* MSVC Paths were put into the MinGW block, so Mingw did not work anymore.
* Also fix paths for vc2010 libs now, so they should work now with cmake.
2012-08-04 11:39:16 +00:00
Sergey Sharybin
4f410971c3 Camera tracking presets
- Fix for copy default settings from active track operator
- Add meaningful tracking presets

API changes:

- Added parameter exact to Marker.find_frame, so now it's
  possible to get estimated marker

- Added Marker.pattern_bound_box to get pattern's bound box
2012-08-04 10:47:31 +00:00
Sergey Sharybin
e7f8b52aee Tomato Cycles: minor code cleanup
Move center tile acquiring code into own function. Should be
easier for time being when we'll want to support other tile
render orders.

Also now there should be a single bucket growing from center
when multi-GPU is used. Can't test this here tho.
2012-08-04 09:13:52 +00:00
Campbell Barton
96bda09d23 code cleanup: use camelcase for struct name. 2012-08-03 23:44:50 +00:00
Campbell Barton
ee86f7fe15 dont re-combute composite nodes when knife and add-socket operators don't add any links. 2012-08-03 23:44:19 +00:00
Campbell Barton
28ab27a49a allow editing masks in an image space when there is no image.
also simplify image listener.
2012-08-03 22:33:45 +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
84df85164d fullscreen mask editing now works in the image space over a viewer node. 2012-08-03 20:56:04 +00:00
Campbell Barton
1d5b2ea253 mask transforming when a mesh object was in editmode (but had no UV's), failed 2012-08-03 20:12:49 +00:00
Campbell Barton
a76b704f9a change blender minversion because of BMesh data. 2012-08-03 15:23:17 +00:00
Sergey Sharybin
b5e1419e5b Tomato Cycles: internal cleanup of tile-based integrator
This commit solves couple of issues appeared with new integrator:

- Render job progress bar is now shows progress based on number of
  rendered tiles. This is the same as Blender Internal does.

  This still requires some further thoughts because for GPU it's
  better to use single tile and in this case progress bar should
  be based on number of rendered samples.

- Removes "global" sample counter from progress descriptor. There's
  no more global-being sample which makes sense.

  This counter was replaced with tile counter.

- Use proper sample number when copying render buffer to blender.
  It used to be final sample number used which lead to tiles
  appearing from complete dark to normal brightness as they're
  being rendered. Now tile would be displayed with proper
  brightness starting from the very first sample.

  Use sample counter stored in render tile descriptor and pass
  it to update / write callbacks.

This was tested on CPU and GPU CUDA rendering.

Additional change:

  OpenCL rendering now should be cancellable before it finished
  rendering all the samples (the same change as for CPU/CUDA from
  a while ago).

This part of commit wasn't actually tested, would do it later.
2012-08-03 15:18:42 +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
Campbell Barton
19740e9233 svn merge ^/trunk/blender -r49520:49531 2012-08-03 13:29:33 +00:00
Campbell Barton
07da83a3b3 add option to link fonts in make links menu. 2012-08-03 13:27:58 +00:00
Campbell Barton
ca9f6870f6 font filepath wasn't editable from python. 2012-08-03 13:03:53 +00:00
Sergey Sharybin
6374e3b49d DO not draw active outline for collapsed nodes when they're not selected
Also made corrections to currently unused code
2012-08-03 11:39:34 +00:00
Sergey Sharybin
e135bfe41b Correction top previous commit: tiles were counted in opposite way 2012-08-03 11:13:38 +00:00
Sergey Sharybin
535a17dd18 Tomato Cycles: fix own regression in currently rendering tile status 2012-08-03 10:55:33 +00:00
Lukas Toenne
771a7241b9 Fix for node placement when copying to/pasting from clipboard. Child node location is always relative to parent nodes (if the parent is also copied) and must not be offset. Also takes the offset of the edited node group in the editor into account now. 2012-08-03 10:51:29 +00:00
Sergey Sharybin
ecab45a018 Tomato Cycles: fix wrong center coordinate when using multi-device configurations 2012-08-03 10:42:21 +00:00
Campbell Barton
854e122e5d style cleanup: compositor 2012-08-03 10:19:13 +00:00
Lukas Toenne
c12d0fd76c Fix for node clipboard copy operator for Frame nodes. Was redirecting the parent pointer of the original instead of the copied nodes. 2012-08-03 10:18:52 +00:00
Campbell Barton
d3d510740c svn merge ^/trunk/blender -r49518:49520 2012-08-03 09:53:24 +00:00
Campbell Barton
52e31a4866 fix for bokeh blur using uninitialized memory - it would cause some tiles not to be blurred.
was in fact a bug in MemoryBuffer::getMaximumValue
2012-08-03 09:51:10 +00:00
Sergey Sharybin
f736f183a5 Merging r49499 through r49518 from trunk into soc-2011-tomato 2012-08-03 09:08:40 +00:00
Campbell Barton
db8c9c24f6 code cleanup: remove unused includes 2012-08-02 23:03:16 +00:00
Thomas Dinges
ffd8352f56 Typo fix, sorry. :/ 2012-08-02 22:07:10 +00:00
Campbell Barton
8f07833ed5 code cleanup: move node background image operators into node_view.c 2012-08-02 21:52:09 +00:00
Thomas Dinges
fa04832247 Code cleanup:
* Removed some remaining defines for AVI_CODEC (from the old 2.4x days and windows only), because only some defines were left, no underlying code to bring back, so just as good remove for good.
2012-08-02 21:50:49 +00:00
Campbell Barton
5e60ccc65c rename node_state.c --> node_view.c 2012-08-02 21:36:33 +00:00
Campbell Barton
e86e5074f6 code cleanup: double promotion warnings 2012-08-02 21:17:12 +00:00
Sergey Sharybin
1a5998bc4e Remove old boolean operation module
Carve proved it's a way to go, so the time have came to get rid of old
boolean operation module which isn't used anymore.

Still kept BOP interface but move it to BSP module. At some point it
could be cleaned up further (like perhaps removed extra abstraction
level or so) but would be nice to combine such a refactor with making
BSP aware of NGons.

Tested on linux using both cmake and scons, possible regressions on
windows/osx. Would check windoes build just after commit.
2012-08-02 16:42:30 +00:00
Campbell Barton
ba5c635502 fix for crash when node groups loose their ID pointer references (when linked libs don't load) 2012-08-02 16:33:38 +00:00
Sergey Sharybin
7aa44d088f Node selection: make node active before it could be unselected by extending
selection, which matches behavior of all other areas in blender.
2012-08-02 16:01:05 +00:00