Commit Graph

66005 Commits

Author SHA1 Message Date
Sergey Sharybin
d30987fd59 Camera tracking integration: more code cleanup 2011-11-10 11:16:40 +00:00
Sergey Sharybin
55d0cb04aa Camera tracking integration: cleanup and finish some parts of recent commit
- Replace set of booleans with menu, so now you'll simply be unable to choose
  unsupported refine combination
- Some internal code cleanup and minor refactor
2011-11-10 11:16:33 +00:00
Joshua Leung
9111213a98 Whitespace tweaks 2011-11-10 10:34:26 +00:00
Miika Hamalainen
afeb0eeaf0 Dynamic Paint merge:
Commit Dynamic Paint from "soc-2011-carrot" branch into trunk.

End-user documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Dynamic_Paint

GSoC wiki page:
http://wiki.blender.org/index.php/User:MiikaH/GSoC-2011-DynamicPaint
2011-11-10 10:24:34 +00:00
Sergey Sharybin
1e035381d1 Workaround #29205: Crash while using Edge Split modifier (while rotating vertices in edit mode with edge split viewable)
This bug is caused by exactly the same reason as #26316: differences in how new vertices/edges
are getting calculated first and how they're adding later. In some cases extra vertices are
creating which weren't counted before.

This patch prevents crash in such situations, but result mesh can be a bit wrong.
This should work fine in bmesh, so think it's acceptable to have such workaround
before actual fix coming with bmesh.
2011-11-10 08:29:22 +00:00
Campbell Barton
c2d6fc4da3 - possible fix for vertex paint 'fill' crash.
- remove unneeded call to defvert_find_index() when weight painting.
2011-11-10 06:06:35 +00:00
Campbell Barton
cd9b51c1bf add some missing headers to cmake, also add some files as comments since it seems they should be added but evidently work fine without. 2011-11-10 06:05:22 +00:00
Campbell Barton
121ff4223d svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build 2011-11-10 04:17:43 +00:00
Campbell Barton
77c5160791 quiet warning 2011-11-10 04:03:08 +00:00
Campbell Barton
5caf6e9070 presets now work from non-redo popups,
ended up having to add a new pointer into the uiBlock (which I'd rather have avoided), but setting the uiLayoutSetContextPointer(..) was complicated to properly use for submenus and popus.
2011-11-10 03:44:50 +00:00
Campbell Barton
a96c3ce9e0 fix compile errors for previous merge 2011-11-10 03:40:02 +00:00
Campbell Barton
685041d53a svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs 2011-11-10 03:05:11 +00:00
Jason Hays
08cc1c6bb9 While reviewing this part of the code for a Blender Proceedings article, I noticed that the lock enforcer was taking several improper steps to redistribute evenly with multi-paint.
Beforehand, a few problems were in view: some of the indexing was changed towards the end to use the more efficient stack structure, but needed to use the correct def group indices.

Also, the designated selected group would use its own value to acquire the standard to base change distributed to the others.

Lastly, the total_change was used rather than -left_overs in the formula to compute the new designated weight within the means of the locks' allowed changes.


Now, while maintaining the ratios of the selection, it correctly returns left over change that could not be redistributed to the unlocked groups.
2011-11-10 02:09:58 +00:00
Campbell Barton
ee1828be19 svn merge -r41649:41650 ^/trunk/blender 2011-11-10 01:58:48 +00:00
Campbell Barton
130b4429b0 svn merge -r41638:41648 ^/trunk/blender 2011-11-10 01:50:22 +00:00
Sergey Sharybin
ce15c0c943 One library from OpenEXR is needed for oiio. Hope buildbot is working fine now. 2011-11-09 19:25:16 +00:00
Sergey Sharybin
473ebc8827 Disable libmv for blenderplayer rules used by buildbot 2011-11-09 19:04:17 +00:00
Sergey Sharybin
f09f5eec57 - Added options to link staticly against oiio/boost
- Also changed buildbot settings so now linking should happe staticly
2011-11-09 19:02:42 +00:00
Antony Riakiotakis
2a747e8b03 Fixes for MinGW cmake debug build:
* OpenEXR doesn't need debug suffix
* Fix libmv template issue when linking by removing duplicate libmv inclusion. I wonder how this never turned up in release builds as well.

Important: Since OpenImageIO went into trunk, OpenEXR, possibly along with other image libraries will need to be turned on too because OIIO depends on them.
2011-11-09 18:50:48 +00:00
Nathan Letwory
f0adbb7746 Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init.
Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).
2011-11-09 17:22:55 +00:00
Sergey Sharybin
1ff2018842 Enable Cycles for buildbot 2011-11-09 17:18:37 +00:00
Miika Hamalainen
1b4a54ad73 Merge with trunk r41701 2011-11-09 15:46:53 +00:00
Bastien Montagne
bc5ec4e69c Fixed/restored translation of node classes (in foreach_nodeclass funcs) 2011-11-09 15:00:11 +00:00
Andrew Wiggin
0811236da2 Fix a particle memory allocation mismatch using MEM_allocN for alloc and BLI_cellalloc_free for free 2011-11-09 14:39:49 +00:00
Bastien Montagne
e4269043b4 Moving i18n code to BLF_translation.h
This way, we will be able to use it in non-UI parts of the code too.
2011-11-09 14:13:17 +00:00
Antony Riakiotakis
ee1569b933 No tabs in scons! Sorry for that.. 2011-11-09 14:00:24 +00:00
Brecht Van Lommel
adf17b48d8 Cycles: mac + scons build should not work. 2011-11-09 11:49:39 +00:00
Antony Riakiotakis
2f1e51ac99 correct comment, no longer needed. 2011-11-09 11:38:04 +00:00
Antony Riakiotakis
83b16687b9 Make scons work MinGW. This commit resolves several issues such as enable OpenEXR, Game Engine and Player, enable latest features, and solve link order for gcc. So MinGW is right now fully supported as a build system for release type builds. Debug builds not tested. 2011-11-09 11:33:10 +00:00
Keir Mierle
d4fec9f19f Assorted camera tracker improvements
- Add support for refining the camera's intrinsic parameters
  during a solve. Currently, refining supports only the following
  combinations of intrinsic parameters:

    f
    f, cx, cy
    f, cx, cy, k1, k2
    f, k1
    f, k1, k2

  This is not the same as autocalibration, since the user must
  still make a reasonable initial guess about the focal length and
  other parameters, whereas true autocalibration would eliminate
  the need for the user specify intrinsic parameters at all.

  However, the solver works well with only rough guesses for the
  focal length, so perhaps full autocalibation is not that
  important.

  Adding support for the last two combinations, (f, k1) and (f,
  k1, k2) required changes to the library libmv depends on for
  bundle adjustment, SSBA. These changes should get ported
  upstream not just to libmv but to SSBA as well.

- Improved the region of convergence for bundle adjustment by
  increasing the number of Levenberg-Marquardt iterations from 50
  to 500. This way, the solver is able to crawl out of the bad
  local minima it gets stuck in when changing from, for example,
  bundling k1 and k2 to just k1 and resetting k2 to 0.

- Add several new region tracker implementations. A region tracker
  is a libmv concept, which refers to tracking a template image
  pattern through frames. The impact to end users is that tracking
  should "just work better". I am reserving a more detailed
  writeup, and maybe a paper, for later.

- Other libmv tweaks, such as detecting that a tracker is headed
  outside of the image bounds.

This includes several changes made directly to the libmv extern
code rather expecting to get those changes through normal libmv
channels, because I, the libmv BDFL, decided it was faster to work
on libmv directly in Blender, then later reverse-port the libmv
changes from Blender back into libmv trunk. The interesting part
is that I added a full Levenberg-Marquardt loop to the region
tracking code, which should lead to a more stable solutions. I
also added a hacky implementation of "Efficient Second-Order
Minimization" for tracking, which works nicely. A more detailed
quantitative evaluation will follow.
2011-11-09 10:07:43 +00:00
Bastien Montagne
f9e3aa3da5 minor: Moved italian and russian translations to "nearly done" menu part. 2011-11-09 10:04:36 +00:00
Joshua Leung
b603e1b1ca Moving version-patches for theme/userpref setting changes as result of
GSoC11-Pepper changes forward to the version patch in place for Cycles +
Tracking.

It turns out that the original version patches introduced for these settings
were being done for the wrong version, and hence did not show in trunk as they
should have (2.59 came out before the branch was merged, so this kindof slipped
under the radar). The affected settings were:
- default handle-type (which was supposed to be "auto-clamped" but was "auto" in
trunk)
- theme settings for these handle colours
2011-11-09 03:38:36 +00:00
Bastien Montagne
5a6bf231f0 minor: some fixes and tweaks in new messages, found while translating them in french... 2011-11-08 23:27:31 +00:00
Brecht Van Lommel
46dcad970c Cycles: fix light strength mistmatch when clicking "use nodes".
Regarding merge status, there should be no build failures, but cycles may not
be enabled in your build, we are still solving:

* Windows: CUDA kernel compile at runtime is failing, probably will have to
  do precompiled kernel again.
* Mac: scons is not building cycles yet.
* Linux doesn't have boost + openimageio libs available in lib/ yet, so it
  requires manual install of those libs still.
2011-11-08 22:38:10 +00:00
Thomas Dinges
7f273394d5 Cycles:
* Scons: Disable Cycles per default on Linux/Mac for now until compile issues have been sorted out.
2011-11-08 21:46:31 +00:00
Brecht Van Lommel
262ac7340e Cycles: cmake tweaks for linux build, instructions on the wiki no longer worked. 2011-11-08 21:40:08 +00:00
Thomas Dinges
af867438fc Scons:
* Fixing x64 compile with Cycles.
2011-11-08 21:17:42 +00:00
Thomas Dinges
a645935a1d Build system fixes:
* Fixed Boost libs names after upgrade to 1.47
* Remove old reference to space_sound from cmake.
2011-11-08 20:56:55 +00:00
Howard Trickey
4075fd85b9 add clip.py and space_clip.py, needed for last merge with trunk 2011-11-08 20:40:27 +00:00
Nathan Letwory
c9bca51e76 Add compiles support for Cycles.
No CUDA compiling yet, will be added later.
2011-11-08 20:40:02 +00:00
Campbell Barton
33814e0093 edits to cycles cmake files so cmake_consistency_check.py can parse them. 2011-11-08 20:27:37 +00:00
Campbell Barton
76f77514d3 don't overwrite existing CMAKE_CXX_FLAGS for cycles (they may be important) 2011-11-08 19:08:56 +00:00
Nathan Letwory
7d7079a58a Remove redundant .remove() 2011-11-08 19:04:19 +00:00
Antony Riakiotakis
2a0451dc46 Fix GLEW linking error on MinGW.
The __imp__ prefix on glew lib linking errors should have been a good indication: the code was looking for the glew dll.
Bypassed by adding GLEW_STATIC to the definitions.
2011-11-08 18:58:29 +00:00
Brecht Van Lommel
0ed2309b4d Cycles: fix crash loading existing files, forgot to merge over this line. 2011-11-08 18:49:12 +00:00
Campbell Barton
127f9e9b8f quiet warning 2011-11-08 18:23:23 +00:00
Campbell Barton
4292fa702f stop cmake from overwriting BOOST_ROOT and OPENIMAGEIO_ROOT_DIR which the builder is supposed to be able to set. 2011-11-08 18:15:53 +00:00
Brecht Van Lommel
8cfc17c7cd Cycles Merge:
* It seems we have a problem compiling the CUDA kernel at runtime on Windows,
  will need to investigate more how to solve this best, CPU render should go
  fine though.
* Change OPENIMAGEIO to OPENIMAGEIO_ROOT_DIR on linux for consistency.
2011-11-08 17:53:49 +00:00
Antony Riakiotakis
fb925d9ad3 Update MinGW to use correct lib location for boost 2011-11-08 17:19:14 +00:00
Brecht Van Lommel
24aebc444b Cycles Merge
Documentation:
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles

Cycles is available is an extra render engine from the top header. It's not
feature complete, consider this as a first preview release. Known bugs:
http://wiki.blender.org/index.php/Dev:2.6/Source/Render/Cycles/KnownIssues

Building currently only works with CMake, SCons support is being worked on
and should be available soon.

Also missing still is precompiled OpenImageIO and Boost for Linux, these will
be added later in lib/linux*, if you do not have these installed on your
system, Cycles will simply not be available.
2011-11-08 17:00:40 +00:00