Commit Graph

25479 Commits

Author SHA1 Message Date
Sergey Sharybin
d30504ce73 Probably merging conflict. Reverting startup.blend to version from trunk.
In my local GIT repo i've got rid of changing startup.blend -- it's unneeded
due to all needed stuff should be done via themes do_versions.
2011-06-22 16:16:25 +00:00
Sergey Sharybin
0bb215eece Camera tracking integraiton
===========================

- Corrected copyrights in my new files header.
- Added debug option to dump as PNG image content of search
  areas tracking between which was failed.
- Removed internal tracking settings like pyramid level and
  tolerance. Weren't useful neither for me nor for artists.
- Fixed bug in BKE_tracking_get_marker which could lead
  to failure of getting marker for current frame when
  there's marker for requested frame.
- Fixed bug with disappearing markers after tracking for
  cases when marker was added at frame different from
  tracking start frame and tracking start frame is
  equal to tracking end frame.
- Stop tracking when no markers could be tracked.
- Changed marker selection rules:
  * If marker isn't selected, all it's areas are getting
    selected with mouse.
  * If marker is selected and selection type doesn't have
    "extend" mode (SHIFT isn't holded down) the nearest
    to mouse cursor area would be selected. All the reast areas
    would loose selection.
- Limit number of frames which would be used in "Track Markers"
  operator. So now you could easily track along 10/20/etc frames.
- Change scene current frame after "Track Markers" operator.
- Implemented speed limitors. Now tracking could happen:
  * As fast as possible
  * With reatime speed (scene FPS)
  * With half of realtime speed
  * With quarter of realtime speed.
- Got rid of orig_user in MovieTrackingContext and user
  in TrackMarkersJob. This prevents crashes when user
  joins some space to SpaceClip from which tracking was started.
- Made keyframes on path bigger and do not draw keyframes for
  non-selected markers.

TODO: need to get rid of storing main, scene and screen
      in TrackMarkersJob. This is needed to set scene's
      current frame after tracking (such behavior is comfortable
      for artists) but this could lead to crash if scene is
      getting removed when tracking job is running.

      Render animation operator also stores scene and main,
      so such solution could be fine for first time before
      we've got something smarter.
2011-06-22 14:54:53 +00:00
Sergey Sharybin
68b7d48e01 Merging r37704 through r37731 from trunk into soc-2011-tomato 2011-06-22 14:44:54 +00:00
Campbell Barton
1309f17103 cmake was installing .bfont.ttf in ~/.blender/VER/config, use ~/.blender/VER instead (as with scons) 2011-06-22 08:43:01 +00:00
Sergey Sharybin
9f769c43a3 Merging r37594 through r37703 from trunk into soc-2011-tomato 2011-06-21 18:24:00 +00:00
Campbell Barton
eaae38551f pep8 compliance 2011-06-21 17:17:51 +00:00
Campbell Barton
d33b63c5d8 update cmake checker to ignore file list and add some headers to the source list. 2011-06-21 17:00:34 +00:00
Ton Roosendaal
22c68cd748 New 2.58 splash image. Thanks Rogério Perdiz!
(Judge committee Sebastian_K && FrancoisGFX)
2011-06-21 16:54:34 +00:00
Ton Roosendaal
20e273a695 Upping the release number to 2.58 2011-06-21 16:38:28 +00:00
Martin Poirier
8a335767d5 Snapping/Project
Disable editmesh as target if proportional edit is on (that was messed up incorrectly in revision 33233)
2011-06-21 15:28:13 +00:00
Ton Roosendaal
5dd76a3f4e 1 pixel tweak to have outliner icons + selection circles align
for default DPI. Problem now is that icons/text are scaling
and drawing with pixel units, whilst other items draw subpixel.
This makes not every dpi size result in perfect aligning yet.
2011-06-21 13:02:21 +00:00
Janne Karhu
2145005e5e Fix for [#26939] Hair Combing intersects emitter when combed fast
* Hair combing now uses substeps to apply the combing when the mouse movement exceeds 0.2 of the brush radius.
* This could make combing a bit slower on fast mouse movements, but the increase in combing quality is definitely worth it.
2011-06-21 11:15:37 +00:00
Campbell Barton
a50aa13fac py api: make all classes __init__ functions in a readonly state, except for operators.
In bug [#27701], the panels __init__ function (which runs on every draw), was adding new rna properties.
2011-06-21 08:09:42 +00:00
Campbell Barton
418d2ce49e allow rna to set vertex parent indices, blender checks for invalid values on access.
build blenderplayer by default on linux with scons.
2011-06-21 07:41:49 +00:00
Campbell Barton
a48a4270dc fix for PLY import using directory only select, operators which define 'files' but not 'filename' or 'filepath' would use the directory selector.
also made code less confusing.
2011-06-21 04:03:26 +00:00
Campbell Barton
ccc112a857 fix for error in swizzle assignment leaving an unhandled exception. 2011-06-21 02:15:07 +00:00
Dalai Felinto
768184753a fix for build with cmake (patch by Joerg Mueller) 2011-06-20 22:44:35 +00:00
Thomas Dinges
ed3dadf489 Blender 2.58 release preparations:
* Update of Release Log Links to point to: http://www.blender.org/development/release-logs/blender-258/
2011-06-20 20:21:52 +00:00
Campbell Barton
c849a938a0 fix for crash drawing zero length motion path and a leak with zero length paths. 2011-06-20 17:50:59 +00:00
Brecht Van Lommel
203e02f9d7 Fix related to #27689: unwrap, pack island, minimize stretch now cancel
operator if there are no uv's selected.
2011-06-20 17:28:25 +00:00
Ton Roosendaal
f6d899af05 Bugfix #27692
Render + compositing error:
When adding renderlayer nodes in a composite, without having own
scene render, the renderlayer nodes were not tagged as changed,
causing compositing to give previous result.
2011-06-20 16:38:21 +00:00
Campbell Barton
692e0ebc13 fix for incorrect bake api usage. but not a bug. 2011-06-20 15:20:33 +00:00
Campbell Barton
11014defdb since render branch isnt planned to be merged now, enable strict warning flags for cmake and tag unused vars. 2011-06-20 15:17:02 +00:00
Nathan Letwory
d278637337 Fix [#26912] [Collada] Screw up with names/ids on import
Reported by Valeriy Firsov

Use the node name if it exists, fall back to id otherwise.
2011-06-20 12:43:10 +00:00
Nathan Letwory
81f5679ff5 Fix [#26821] Import Collada: instance_node still incorrectly handled
reported by David Roy
patch submitted by Camillo Dell'mour
2011-06-20 10:50:17 +00:00
Nathan Letwory
201052a3ff Apply Patch [#27454] Add simple Transparency texture import for COLLADA
submitted by Steffen Ohrendorf.
2011-06-20 10:28:37 +00:00
Nathan Letwory
bb851003b5 Remove redundant e usage. Energy is already multiplied into exported light. Fixes potential bug (e used uninitialised, reported by Campbell Barton on IRC). 2011-06-20 10:22:39 +00:00
Nathan Letwory
dbe7488c43 Fix [#27474] Blender crashes on collada import if input_set is missing
reported by Rebin Cornelius.

This needs patch from upstream report http://code.google.com/p/opencollada/issues/list?thanks=164 applied to OpenCOLLADA. lib/windows/collada and lib/win64/collada have already been updated. Ensures we don't read past array boundaries.
2011-06-20 09:34:35 +00:00
Brecht Van Lommel
c27fa83cf7 Fix #27703: reflection texture coordinates + nodes not working right in GLSL. 2011-06-20 09:08:41 +00:00
Campbell Barton
57ed59eac2 fix [#27700] Add effect strip ignore channel argument 2011-06-20 04:09:33 +00:00
Michael Fox
3e76245eb2 small fix, This enables correction of the tangent when normal mapping is in use and tangent lighting will be used 2011-06-20 03:37:41 +00:00
Campbell Barton
09fc9257e1 fix [#27664] startup.blend - manipulator user-prefs
regarding issues in the report
 1) fixed in previous commit.
 2) intentional leaving as is.
 3) left 'handle size' as is IMHO acceptably general, edited 'hotshop' tooltip/
 4) corrected default values.
2011-06-20 03:24:07 +00:00
Campbell Barton
4ce97c5ed4 changes to startup.blend
- enable manipulator option, applies to new 3d views (not sure why it was disabled) - reported in [#27664]
- remove rigify and netrender scene ID properties
- set console scrollback to 256, was 128 which could sometimes cut off output of help()
- enabled syntax highlighting and line number in the text editor for game logic and python screens
2011-06-20 03:10:02 +00:00
Michael Fox
6d7e3509a9 small safety fix for recent commit to normal mapping (uninitialised variables) 2011-06-20 02:37:13 +00:00
Daniel Salazar
dd364944d1 By Morten S. Mikkelsen; this adds support for tangent bump shading
left: legacy bump, righ: sparkybump

http://pasteall.org/pic/show.php?id=13875

bugs [#26320], [#27506]

there's still an issue with texture OSA as you can see
2011-06-19 20:41:41 +00:00
Campbell Barton
8eb375048e removing python includes for blenkernel since pynodes are commented. 2011-06-19 09:32:37 +00:00
Campbell Barton
b15a2b0ffc cmake: added FindOpenJPEG module. 2011-06-19 07:46:24 +00:00
Campbell Barton
145944d66f cmake:
new macro file_list_suffix() for adding a suffix to every file in a path before the file extension.
 useful to create names for debug libs on windows.
2011-06-19 06:57:56 +00:00
Campbell Barton
f31bae0aab fixed possible use of uninitialized variable. 2011-06-19 01:23:50 +00:00
Guillermo S. Romero
31093223cd SVN maintenance. 2011-06-18 23:22:55 +00:00
Campbell Barton
968b2a8afb rename cmake include/libraries to conform with suggested cmake names 2011-06-18 14:12:54 +00:00
Campbell Barton
1283b07409 use ascii drawing function where utf8 isnt needed. 2011-06-18 09:01:26 +00:00
Campbell Barton
82216030e9 py-api: store frequently used strings as unicode PyObject's to avoid creating/distroying every time.
also fix for cmake warning
2011-06-18 08:45:45 +00:00
Campbell Barton
f7e22c729e throw an error if preprocessor definitions are used for DNA array lengths (previously would fail silently & not work right). 2011-06-18 03:14:24 +00:00
Andrea Weikert
64d02584e1 fix fileselect for images from sequencer
* recent code to provide directory only fileselect broke selection of images with 'A' (rev. rev. 37552.)
2011-06-17 21:24:05 +00:00
Sergey Sharybin
030f8c3a10 Camera tracking integration
===========================

Made a typo when was applying locally created patch.
Fixes crash when switching to "Movie" in 3d viewport background.
2011-06-17 15:00:28 +00:00
Sergey Sharybin
5c7771f6d4 Camera tracking integration
===========================

Test tool: convert track to location fcurves for object in 3d world.
1 pixel on footage is equal to 1 Blender unit.

Added for testing only, could be removed any time -- real
parenting to markers/bundles are only under design now.
2011-06-17 14:47:41 +00:00
Sergey Sharybin
35633f35d5 Camera tracking integration
===========================

Refactored interface of movie clip editor:
- Remove all "modal" things like active tool and mode.
  They aren't so useful as I thought when was starting
  implementation of UI.
- Toolbar (T-panel) now contains tools only, no options/properties there.
- All properties are moved to properties panel (N-panel).
2011-06-17 14:47:22 +00:00
Sergey Sharybin
4cd25c1886 Camera tracking integration
===========================

- libmv's sources would now be added to qtcreator project.
- Fixed compilation with blenderplayer enabled and cmake.
- Fixed bug when tracking was done from frame different from
  initial marker's frame number.
- Implemented backwards tracking.
- Added option to draw track's path. Would be enabled by default
  for new scenes. Could be enabled on "Display" panel for
  files saved in previous version.
- Added operator to clean track path so it could be
  easily tracked form scratch.
- Added hotkeys for tracking, backwards tracking and
  cleaning track path (Ctrl-T, Ctrl-Shift-T and Alt-T).
- Fixed crash when setting clip as a footage.
- Small optimization when trying to track without
  selected markers.
2011-06-17 14:47:04 +00:00
Sergey Sharybin
f4ce5770ca Merging r37518 through r37593 from trunk into soc-2011-tomato 2011-06-17 14:41:44 +00:00