blender.git
8 years agoCycles: fix crash in image assign/remove in image editor.
Brecht Van Lommel [Thu, 10 Nov 2011 13:39:25 +0000 (13:39 +0000)]
Cycles: fix crash in image assign/remove in image editor.

8 years agoNodes: fix crash loading old files that have node sockets changed, the version
Brecht Van Lommel [Thu, 10 Nov 2011 13:38:55 +0000 (13:38 +0000)]
Nodes: fix crash loading old files that have node sockets changed, the version
patch for the default value storage needs to be done before lib linking,
otherwise this can crash. Fixes problem opening some old cycles files.

8 years agoFix [#29214] build modifier calculates wrong fraction of faces/verts/edges to draw
Andrew Wiggin [Thu, 10 Nov 2011 13:28:58 +0000 (13:28 +0000)]
Fix [#29214] build modifier calculates wrong fraction of faces/verts/edges to draw

8 years agoCycles: when material/world/lamp doesn't use nodes, show color in the UI.
Brecht Van Lommel [Thu, 10 Nov 2011 13:00:53 +0000 (13:00 +0000)]
Cycles: when material/world/lamp doesn't use nodes, show color in the UI.

8 years agoDynamic Paint:
Miika Hamalainen [Thu, 10 Nov 2011 13:00:27 +0000 (13:00 +0000)]
Dynamic Paint:
* Added BKE_dynamicpaint.h to CMake list.
* Changed some unsigned integers back to signed, as OpenMP can't iterate unsigned values anyway.
* Fixed more warnings.

8 years agoCycles: many of the new nodes were not showing properties/buttons in nodes in
Brecht Van Lommel [Thu, 10 Nov 2011 12:53:40 +0000 (12:53 +0000)]
Cycles: many of the new nodes were not showing properties/buttons in nodes in
the node editor.

8 years agoCycles:
Brecht Van Lommel [Thu, 10 Nov 2011 12:52:17 +0000 (12:52 +0000)]
Cycles:
* Add back option to bundle CUDA kernel binaries with builds.
* Disable runtime CUDA kernel compilation on Windows, couldn't get this working,
  since it seems to depend on visual studio being installed, even though for
  this particular case it shouldn't be needed. CMake only at the moment.
* Runtime compilation on linux/mac should now work if nvcc is not installed in
  the default location, but available in PATH.

8 years agoquiet some warnings from recent merge
Campbell Barton [Thu, 10 Nov 2011 12:28:26 +0000 (12:28 +0000)]
quiet some warnings from recent merge

8 years agoFixed possible issue drawing undistorted clip in clip editor.
Sergey Sharybin [Thu, 10 Nov 2011 12:15:09 +0000 (12:15 +0000)]
Fixed possible issue drawing undistorted clip in clip editor.
Check for marker's visibility was a bit odd.

8 years agoRestored GPL header of NOD_composite.h (funny s&r ?!?).
Bastien Montagne [Thu, 10 Nov 2011 11:33:57 +0000 (11:33 +0000)]
Restored GPL header of NOD_composite.h (funny s&r ?!?).

8 years agoWhitespace tweaks
Joshua Leung [Thu, 10 Nov 2011 10:34:26 +0000 (10:34 +0000)]
Whitespace tweaks

8 years agoDynamic Paint merge:
Miika Hamalainen [Thu, 10 Nov 2011 10:24:34 +0000 (10:24 +0000)]
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

8 years agoWorkaround #29205: Crash while using Edge Split modifier (while rotating vertices...
Sergey Sharybin [Thu, 10 Nov 2011 08:29:22 +0000 (08:29 +0000)]
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.

8 years ago- possible fix for vertex paint 'fill' crash.
Campbell Barton [Thu, 10 Nov 2011 06:06:35 +0000 (06:06 +0000)]
- possible fix for vertex paint 'fill' crash.
- remove unneeded call to defvert_find_index() when weight painting.

8 years agoadd some missing headers to cmake, also add some files as comments since it seems...
Campbell Barton [Thu, 10 Nov 2011 06:05:22 +0000 (06:05 +0000)]
add some missing headers to cmake, also add some files as comments since it seems they should be added but evidently work fine without.

8 years agoquiet warning
Campbell Barton [Thu, 10 Nov 2011 04:03:08 +0000 (04:03 +0000)]
quiet warning

8 years agopresets now work from non-redo popups,
Campbell Barton [Thu, 10 Nov 2011 03:44:50 +0000 (03:44 +0000)]
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.

8 years agoWhile reviewing this part of the code for a Blender Proceedings article, I noticed...
Jason Hays [Thu, 10 Nov 2011 02:09:58 +0000 (02:09 +0000)]
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.

8 years agoOne library from OpenEXR is needed for oiio. Hope buildbot is working fine now.
Sergey Sharybin [Wed, 9 Nov 2011 19:25:16 +0000 (19:25 +0000)]
One library from OpenEXR is needed for oiio. Hope buildbot is working fine now.

8 years agoDisable libmv for blenderplayer rules used by buildbot
Sergey Sharybin [Wed, 9 Nov 2011 19:04:17 +0000 (19:04 +0000)]
Disable libmv for blenderplayer rules used by buildbot

8 years ago- Added options to link staticly against oiio/boost
Sergey Sharybin [Wed, 9 Nov 2011 19:02:42 +0000 (19:02 +0000)]
- Added options to link staticly against oiio/boost
- Also changed buildbot settings so now linking should happe staticly

8 years agoFixes for MinGW cmake debug build:
Antony Riakiotakis [Wed, 9 Nov 2011 18:50:48 +0000 (18:50 +0000)]
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.

8 years agoFix ${} var usage. Was missing BF_OIIO and BF_BOOST init.
Nathan Letwory [Wed, 9 Nov 2011 17:22:55 +0000 (17:22 +0000)]
Fix ${} var usage. Was missing BF_OIIO and BF_BOOST init.

Noticed still missing: OSX file copying (cycles .py files, kernel files, licenses).

8 years agoEnable Cycles for buildbot
Sergey Sharybin [Wed, 9 Nov 2011 17:18:37 +0000 (17:18 +0000)]
Enable Cycles for buildbot

8 years agoMerge with trunk r41701 soc-2011-carrot
Miika Hamalainen [Wed, 9 Nov 2011 15:46:53 +0000 (15:46 +0000)]
Merge with trunk r41701

8 years agoFixed/restored translation of node classes (in foreach_nodeclass funcs)
Bastien Montagne [Wed, 9 Nov 2011 15:00:11 +0000 (15:00 +0000)]
Fixed/restored translation of node classes (in foreach_nodeclass funcs)

8 years agoMoving i18n code to BLF_translation.h
Bastien Montagne [Wed, 9 Nov 2011 14:13:17 +0000 (14:13 +0000)]
Moving i18n code to BLF_translation.h

This way, we will be able to use it in non-UI parts of the code too.

8 years agoNo tabs in scons! Sorry for that..
Antony Riakiotakis [Wed, 9 Nov 2011 14:00:24 +0000 (14:00 +0000)]
No tabs in scons! Sorry for that..

8 years agoCycles: mac + scons build should not work.
Brecht Van Lommel [Wed, 9 Nov 2011 11:49:39 +0000 (11:49 +0000)]
Cycles: mac + scons build should not work.

8 years agocorrect comment, no longer needed.
Antony Riakiotakis [Wed, 9 Nov 2011 11:38:04 +0000 (11:38 +0000)]
correct comment, no longer needed.

8 years agoMake scons work MinGW. This commit resolves several issues such as enable OpenEXR...
Antony Riakiotakis [Wed, 9 Nov 2011 11:33:10 +0000 (11:33 +0000)]
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.

8 years agominor: Moved italian and russian translations to "nearly done" menu part.
Bastien Montagne [Wed, 9 Nov 2011 10:04:36 +0000 (10:04 +0000)]
minor: Moved italian and russian translations to "nearly done" menu part.

8 years agoMoving version-patches for theme/userpref setting changes as result of
Joshua Leung [Wed, 9 Nov 2011 03:38:36 +0000 (03:38 +0000)]
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

8 years agominor: some fixes and tweaks in new messages, found while translating them in french...
Bastien Montagne [Tue, 8 Nov 2011 23:27:31 +0000 (23:27 +0000)]
minor: some fixes and tweaks in new messages, found while translating them in french...

8 years agoCycles: fix light strength mistmatch when clicking "use nodes".
Brecht Van Lommel [Tue, 8 Nov 2011 22:38:10 +0000 (22:38 +0000)]
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.

8 years agoCycles:
Thomas Dinges [Tue, 8 Nov 2011 21:46:31 +0000 (21:46 +0000)]
Cycles:
* Scons: Disable Cycles per default on Linux/Mac for now until compile issues have been sorted out.

8 years agoCycles: cmake tweaks for linux build, instructions on the wiki no longer worked.
Brecht Van Lommel [Tue, 8 Nov 2011 21:40:08 +0000 (21:40 +0000)]
Cycles: cmake tweaks for linux build, instructions on the wiki no longer worked.

8 years agoScons:
Thomas Dinges [Tue, 8 Nov 2011 21:17:42 +0000 (21:17 +0000)]
Scons:
* Fixing x64 compile with Cycles.

8 years agoBuild system fixes:
Thomas Dinges [Tue, 8 Nov 2011 20:56:55 +0000 (20:56 +0000)]
Build system fixes:
* Fixed Boost libs names after upgrade to 1.47
* Remove old reference to space_sound from cmake.

8 years agoAdd compiles support for Cycles.
Nathan Letwory [Tue, 8 Nov 2011 20:40:02 +0000 (20:40 +0000)]
Add compiles support for Cycles.

No CUDA compiling yet, will be added later.

8 years agoedits to cycles cmake files so cmake_consistency_check.py can parse them.
Campbell Barton [Tue, 8 Nov 2011 20:27:37 +0000 (20:27 +0000)]
edits to cycles cmake files so cmake_consistency_check.py can parse them.

8 years agodon't overwrite existing CMAKE_CXX_FLAGS for cycles (they may be important)
Campbell Barton [Tue, 8 Nov 2011 19:08:56 +0000 (19:08 +0000)]
don't overwrite existing CMAKE_CXX_FLAGS for cycles (they may be important)

8 years agoRemove redundant .remove()
Nathan Letwory [Tue, 8 Nov 2011 19:04:19 +0000 (19:04 +0000)]
Remove redundant .remove()

8 years agoFix GLEW linking error on MinGW.
Antony Riakiotakis [Tue, 8 Nov 2011 18:58:29 +0000 (18:58 +0000)]
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.

8 years agoCycles: fix crash loading existing files, forgot to merge over this line.
Brecht Van Lommel [Tue, 8 Nov 2011 18:49:12 +0000 (18:49 +0000)]
Cycles: fix crash loading existing files, forgot to merge over this line.

8 years agoquiet warning
Campbell Barton [Tue, 8 Nov 2011 18:23:23 +0000 (18:23 +0000)]
quiet warning

8 years agostop cmake from overwriting BOOST_ROOT and OPENIMAGEIO_ROOT_DIR which the builder...
Campbell Barton [Tue, 8 Nov 2011 18:15:53 +0000 (18:15 +0000)]
stop cmake from overwriting BOOST_ROOT and OPENIMAGEIO_ROOT_DIR which the builder is supposed to be able to set.

8 years agoCycles Merge:
Brecht Van Lommel [Tue, 8 Nov 2011 17:53:49 +0000 (17:53 +0000)]
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.

8 years agoUpdate MinGW to use correct lib location for boost
Antony Riakiotakis [Tue, 8 Nov 2011 17:19:14 +0000 (17:19 +0000)]
Update MinGW to use correct lib location for boost

8 years agoCycles Merge
Brecht Van Lommel [Tue, 8 Nov 2011 17:00:40 +0000 (17:00 +0000)]
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.

8 years ago- operator presets now work in the 3D view as well as the file selector.
Campbell Barton [Tue, 8 Nov 2011 16:59:06 +0000 (16:59 +0000)]
- operator presets now work in the 3D view as well as the file selector.

to enable from python:
  bl_options = {'REGISTER', 'UNDO', 'PRESET'}

from C:
  ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO|OPTYPE_PRESET;

- added context member 'active_operator'
- enable this for 'Add Torus' for testing.

8 years agoFix compile after audaspace file source.remove..
Jens Verwiebe [Tue, 8 Nov 2011 16:53:59 +0000 (16:53 +0000)]
Fix compile after audaspace file source.remove..

8 years agoDon't compile AUD_JOSResampleReaderCoeff.cpp twice (it's included in AUD_JOSResampleR...
Sergey Sharybin [Tue, 8 Nov 2011 16:24:31 +0000 (16:24 +0000)]
Don't compile AUD_JOSResampleReaderCoeff.cpp twice (it's included in AUD_JOSResampleReader.cpp)

Patch from nico_ga, thanks!

8 years agoFix #29201: movie clip editor - right click crashes blender
Sergey Sharybin [Tue, 8 Nov 2011 16:09:20 +0000 (16:09 +0000)]
Fix #29201: movie clip editor - right click crashes blender

Just another not very smart check for "boundary" case of usecase.

8 years ago*Correct syntax for static, since we invoke g++ as linker and we have to pass it...
Antony Riakiotakis [Tue, 8 Nov 2011 16:03:28 +0000 (16:03 +0000)]
*Correct syntax for static, since we invoke g++ as linker and we have to pass it to ld.
*CMakefile: Update boost and OpenImageIO libraries for MinGW like in the cycles branch

8 years agoCorrect syntax for static, since we invoke g++ as linker and we have to pass it to ld cycles
Antony Riakiotakis [Tue, 8 Nov 2011 16:02:34 +0000 (16:02 +0000)]
Correct syntax for static, since we invoke g++ as linker and we have to pass it to ld

8 years agoFix #29198: Problem with text interface when you enable the International fonts
Sergey Sharybin [Tue, 8 Nov 2011 15:12:41 +0000 (15:12 +0000)]
Fix #29198: Problem with text interface when you enable the International fonts

Not sure why, but doing the same things as in script from FontForge UI, there's
no issues described in report. Probably matter of some default settings.
Hope it works now fine for everyone.

8 years ago- disable undo for user preferences (every click would do push an undo), was noticeab...
Campbell Barton [Tue, 8 Nov 2011 15:11:27 +0000 (15:11 +0000)]
- disable undo for user preferences (every click would do push an undo), was noticeable on large files.
- also netbeans project file generator now uses branch name for project.

8 years agoCycles now uses correct libs on MinGW
Antony Riakiotakis [Tue, 8 Nov 2011 14:47:03 +0000 (14:47 +0000)]
Cycles now uses correct libs on MinGW

8 years agoCycles:
Brecht Van Lommel [Tue, 8 Nov 2011 14:10:33 +0000 (14:10 +0000)]
Cycles:
* Disable precompiled cuda binaries, always do at run time
* Change preview samples default to 10
* Hide volume panels since they don't do anything yet

8 years agoAttempt to fix #29200: Camera Tracking Solver
Sergey Sharybin [Tue, 8 Nov 2011 14:03:16 +0000 (14:03 +0000)]
Attempt to fix #29200: Camera Tracking Solver

It was an mistake in join tracks operator which lead to reading unitialized memory.

8 years agoTexturing: texture and 3d view draw type changes, these should only have any
Brecht Van Lommel [Tue, 8 Nov 2011 13:07:16 +0000 (13:07 +0000)]
Texturing: texture and 3d view draw type changes, these should only have any
effect for a render engine using new shading nodes. In short:

* No longer uses images assigned to faces in the uv layer, rather the active
  image texture node is what is edited/painted/drawn.
* Textured draw type now shows the active image texture node, with solid
  lighting.
* Material draw mode shows GLSL shader of a simplified material node tree,
  using solid lighting.
* Textures for modifiers, brushes, etc, are now available from a dropdown in
  the texture tab in the properties editor. These do not use new shading nodes
  yet.

http://wiki.blender.org/index.php/Dev:2.6/Source/Render/TextureWorkflow

8 years agoFix for last fix, guess this compiled ok because it's interpreted as a goto label.
Brecht Van Lommel [Tue, 8 Nov 2011 12:58:03 +0000 (12:58 +0000)]
Fix for last fix, guess this compiled ok because it's interpreted as a goto label.

8 years agoFix an issue with uninitialized memory
Jens Verwiebe [Tue, 8 Nov 2011 12:44:57 +0000 (12:44 +0000)]
Fix an issue with uninitialized memory

8 years agoCycles: svn merge -r41627:41650 ^/trunk/blender
Brecht Van Lommel [Tue, 8 Nov 2011 12:33:17 +0000 (12:33 +0000)]
Cycles: svn merge -r41627:41650 ^/trunk/blender

8 years agoNodes: add cycles shader nodes, these will only be available to render engines
Brecht Van Lommel [Tue, 8 Nov 2011 11:38:16 +0000 (11:38 +0000)]
Nodes: add cycles shader nodes, these will only be available to render engines
that use the new shading nodes system. Documentation:

http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes

8 years agoCode cleanup: fix compile warning.
Brecht Van Lommel [Tue, 8 Nov 2011 11:15:40 +0000 (11:15 +0000)]
Code cleanup: fix compile warning.

8 years agoFix: incorrect use of IFACE_ macro, and correct a typo.
Brecht Van Lommel [Tue, 8 Nov 2011 11:02:57 +0000 (11:02 +0000)]
Fix: incorrect use of IFACE_ macro, and correct a typo.

8 years ago- Fixed typo in KLT description tooltip
Sergey Sharybin [Tue, 8 Nov 2011 10:17:50 +0000 (10:17 +0000)]
- Fixed typo in KLT description tooltip
- Fixed inconsistent data type used for pts number in ffmpeg_fetchibuf
  and stored in timecode structure. Not really issue for "correct" movie files,
  but probably can help for "broken" one

8 years agoFix a typo in building undistorted proxies for movie clips.
Sergey Sharybin [Tue, 8 Nov 2011 09:34:43 +0000 (09:34 +0000)]
Fix a typo in building undistorted proxies for movie clips.

Thanks Campbell to point on this issue.

8 years agouse some more logical BLI math functions & tracking used INT_MAX on a short.
Campbell Barton [Tue, 8 Nov 2011 09:02:47 +0000 (09:02 +0000)]
use some more logical BLI math functions & tracking used INT_MAX on a short.

8 years agoCode cleanup and small fixes:
Sergey Sharybin [Tue, 8 Nov 2011 06:11:23 +0000 (06:11 +0000)]
Code cleanup and small fixes:

- Assume all areas are using valid MovieClipUser when using functions from movieclip.c
- Set active scene clip to movie-related nodes in compositor rather than checking
  if there's only one clip in datablocks
- Fixed users count issue when solving camera motion

8 years agoTracker:
Thomas Dinges [Tue, 8 Nov 2011 06:10:04 +0000 (06:10 +0000)]
Tracker:
* Typo fixes for space_clip.py, patch by Mike S on the mailing list.

8 years agoCode cleanup - reshuffling some stuff to avoid buildup of long functions in transform...
Joshua Leung [Tue, 8 Nov 2011 06:09:16 +0000 (06:09 +0000)]
Code cleanup - reshuffling some stuff to avoid buildup of long functions in transform code again

8 years agocmake & pep8 tidy up, also some style edits.
Campbell Barton [Tue, 8 Nov 2011 01:32:34 +0000 (01:32 +0000)]
cmake & pep8 tidy up, also some style edits.

remove unneeded collection length function.

8 years agoSVN maintenance.
Guillermo S. Romero [Mon, 7 Nov 2011 23:50:12 +0000 (23:50 +0000)]
SVN maintenance.

8 years agoUI/Nodes: templates to edit nodes from the properties editor using a tree view,
Brecht Van Lommel [Mon, 7 Nov 2011 22:28:49 +0000 (22:28 +0000)]
UI/Nodes: templates to edit nodes from the properties editor using a tree view,
to be used by cycles. For testing there's a panel in the node editor if you set
debug to 777, didn't enable it because I'm not sure it's very useful there.

8 years agoNodes: add foreach_nodeclass iterator over node classes, use for node add menu.
Brecht Van Lommel [Mon, 7 Nov 2011 22:14:48 +0000 (22:14 +0000)]
Nodes: add foreach_nodeclass iterator over node classes, use for node add menu.

8 years agoFix [#29194] Spelling error
Bastien Montagne [Mon, 7 Nov 2011 19:25:13 +0000 (19:25 +0000)]
Fix [#29194] Spelling error
(yes sir, it is a bugfix :P ).

8 years agoHopefully compilation with MinGW will work again.
Sergey Sharybin [Mon, 7 Nov 2011 18:14:50 +0000 (18:14 +0000)]
Hopefully compilation with MinGW will work again.
Tested with official MinGW and SCons, not sure how ti check it when using CMake.

8 years agoTextures/Shaders: extend TexMapping to include projection options, and add a
Brecht Van Lommel [Mon, 7 Nov 2011 17:35:20 +0000 (17:35 +0000)]
Textures/Shaders: extend TexMapping to include projection options, and add a
ColorMapping struct for color manipulation of textures. These will be the
standard built-in texture node options for manipulating the incoming texture
coordinate and outgoing color.

8 years agoNodes: add socket option to hide the default value in the UI, to be used for
Brecht Van Lommel [Mon, 7 Nov 2011 17:30:52 +0000 (17:30 +0000)]
Nodes: add socket option to hide the default value in the UI, to be used for
sockets that get their default value if no node is connected from elsewhere,
e.g. a texture coordinate.

8 years agoCycles: svn merge -r41613:41627 ^/trunk/blender
Brecht Van Lommel [Mon, 7 Nov 2011 17:13:32 +0000 (17:13 +0000)]
Cycles: svn merge -r41613:41627 ^/trunk/blender

8 years agoRevert fix for #29146, needs deeper changes to solve this fully.
Brecht Van Lommel [Mon, 7 Nov 2011 17:07:54 +0000 (17:07 +0000)]
Revert fix for #29146, needs deeper changes to solve this fully.

8 years agoMerge with trunk r41625
Miika Hamalainen [Mon, 7 Nov 2011 16:36:49 +0000 (16:36 +0000)]
Merge with trunk r41625

8 years agoRNA:
Brecht Van Lommel [Mon, 7 Nov 2011 16:26:53 +0000 (16:26 +0000)]
RNA:
* Expose 3D view camera zoom and offset, needed if you want to precisely
  reconstruct camera parameters.
* Rename SpaceFileBrowser.operator to active_operator, to avoid conflict
  with c++ keyword.

8 years agoquiet warnings when building without libmv
Campbell Barton [Mon, 7 Nov 2011 16:26:23 +0000 (16:26 +0000)]
quiet warnings when building without libmv

8 years agofix for error in own recent commit.
Campbell Barton [Mon, 7 Nov 2011 15:57:52 +0000 (15:57 +0000)]
fix for error in own recent commit.

8 years agouse macro for access to library filepath
Campbell Barton [Mon, 7 Nov 2011 15:55:03 +0000 (15:55 +0000)]
use macro for access to library filepath

8 years agoCMake: add delayed_install macro to specify files to be installed from modules
Brecht Van Lommel [Mon, 7 Nov 2011 15:53:40 +0000 (15:53 +0000)]
CMake: add delayed_install macro to specify files to be installed from modules
other than source/creator.

8 years agoCMake: Boost and OpenImageIO building support (unused still).
Brecht Van Lommel [Mon, 7 Nov 2011 15:44:09 +0000 (15:44 +0000)]
CMake: Boost and OpenImageIO building support (unused still).

8 years agofix for error using freed memory
Campbell Barton [Mon, 7 Nov 2011 15:41:20 +0000 (15:41 +0000)]
fix for error using freed memory

8 years agoSome small fixed for camera tracking:
Sergey Sharybin [Mon, 7 Nov 2011 15:32:32 +0000 (15:32 +0000)]
Some small fixed for camera tracking:

- Lock to selection and center to selection will now work fine with undistorted rendering
- Do not display pyramid for disabled tracks
- Corrected fix for wrong correlation_min property name

8 years agoCycles: svn merge -r41531:41613 ^/trunk/blender
Brecht Van Lommel [Mon, 7 Nov 2011 15:23:08 +0000 (15:23 +0000)]
Cycles: svn merge -r41531:41613 ^/trunk/blender

8 years agominor warning nicer api use
Campbell Barton [Mon, 7 Nov 2011 15:19:26 +0000 (15:19 +0000)]
minor warning nicer api use

8 years agoTracker/Movie Clip Editor:
Thomas Dinges [Mon, 7 Nov 2011 15:19:13 +0000 (15:19 +0000)]
Tracker/Movie Clip Editor:
* Fix property not showing up: correlation_min, was actually called minimum_correlation in RNA.

8 years ago2.6 UI:
Thomas Dinges [Mon, 7 Nov 2011 14:34:56 +0000 (14:34 +0000)]
2.6 UI:
* Minor tweaks after tomato merge, rest of Tomato UI code is excellent. :)

8 years agoBugfix [#29064] armature with curve contraint - crash
Joshua Leung [Mon, 7 Nov 2011 13:25:17 +0000 (13:25 +0000)]
Bugfix [#29064] armature with curve contraint - crash

Spline IK and Auto-IK working together on the same bone chain could
crash due to the somewhat hacky way that they were sharing the same
list for the "iktree" forest. Resolved by doing what I should have
done from the beginning, and made Spline-IK save its ik chains off
into a separate list.

While this fixes the crash, it might be worth investigating outright
disabling this from working in this case, since it can be a bit
confusing to have it appear to not work.

8 years agoCamera tracking integration
Sergey Sharybin [Mon, 7 Nov 2011 12:56:05 +0000 (12:56 +0000)]
Camera tracking integration
===========================

Rest of changes from camera tracking gsoc project.

This commit includes:

- New compositor nodes:
  * Movie Clip input node
  * Movie Undistortion node
  * Transformation node
  * 2D stabilization node

- Slight changes in existing node to prevent code duplication

8 years agoCamera tracking integration
Sergey Sharybin [Mon, 7 Nov 2011 12:55:18 +0000 (12:55 +0000)]
Camera tracking integration
===========================

Commiting camera tracking integration gsoc project into trunk.

This commit includes:

- Bundled version of libmv library (with some changes against official repo,
  re-sync with libmv repo a bit later)
- New datatype ID called MovieClip which is optimized to work with movie
  clips (both of movie files and image sequences) and doing camera/motion
  tracking operations.
- New editor called Clip Editor which is currently used for motion/tracking
  stuff only, but which can be easily extended to work with masks too.

  This editor supports:
  * Loading movie files/image sequences
  * Build proxies with different size for loaded movie clip, also supports
    building undistorted proxies to increase speed of playback in
    undistorted mode.
  * Manual lens distortion mode calibration using grid and grease pencil
  * Supervised 2D tracking using two different algorithms KLT and SAD.
  * Basic algorithm for feature detection
  * Camera motion solving. scene orientation

- New constraints to "link" scene objects with solved motions from clip:

  * Follow Track (make object follow 2D motion of track with given name
    or parent object to reconstructed 3D position of track)
  * Camera Solver to make camera moving in the same way as reconstructed camera

This commit NOT includes changes from tomato branch:

- New nodes (they'll be commited as separated patch)
- Automatic image offset guessing for image input node and image editor
  (need to do more tests and gather more feedback)
- Code cleanup in libmv-capi. It's not so critical cleanup, just increasing
  readability and understanadability of code. Better to make this chaneg when
  Keir will finish his current patch.

More details about this project can be found on this page:
    http://wiki.blender.org/index.php/User:Nazg-gul/GSoC-2011

Further development of small features would be done in trunk, bigger/experimental
features would first be implemented in tomato branch.