blender.git
9 years agoMerging r39029 through r39049 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 5 Aug 2011 06:47:37 +0000 (06:47 +0000)]
Merging r39029 through r39049 from trunk into soc-2011-tomato

9 years agoCamera tracking integration
Sergey Sharybin [Fri, 5 Aug 2011 06:43:20 +0000 (06:43 +0000)]
Camera tracking integration
===========================

- Cleanup wouldn't affect on hidden or locked tracks.
- "Track" operator wouldn't take locked tracks into account
  when checking if there's something to track.

9 years agofix [#28160] Pressing Y on an image sequence to seperate the images takes them out...
Campbell Barton [Fri, 5 Aug 2011 06:26:54 +0000 (06:26 +0000)]
fix [#28160] Pressing Y on an image sequence to seperate the images takes them out of their meta strips

dont show a popup anymore, was silly because you had to change the value for before anything was done, can use f6 redo popup instead, sequencer should eventually have a view3d operator redo panel.

9 years agofix for possible uninitialized RNA strings, when RNA_string_get property is not found...
Campbell Barton [Fri, 5 Aug 2011 06:09:30 +0000 (06:09 +0000)]
fix for possible uninitialized RNA strings, when RNA_string_get property is not found, initialize the string to "".

9 years agofix [#28102] Typing 'C:' into the file selector's directory asks to make a new directory.
Campbell Barton [Fri, 5 Aug 2011 06:06:15 +0000 (06:06 +0000)]
fix [#28102] Typing 'C:' into the file selector's directory asks to make a new directory.

9 years agochange BLO_library_append_begin to take a main argument rather then a context, means...
Campbell Barton [Fri, 5 Aug 2011 05:26:19 +0000 (05:26 +0000)]
change BLO_library_append_begin to take a main argument rather then a context, means the BGE doesnt need to make a new empty context just to pass as an arg.
added doxygen description too.

this quiets the print when the BGE does linking.

9 years agoCamera tracking integration
Sergey Sharybin [Thu, 4 Aug 2011 16:54:26 +0000 (16:54 +0000)]
Camera tracking integration
===========================

Do not register tracking operator in redo panel.

9 years agoMerging r38993 through r39028 from trunk into sox-2011-tomato
Sergey Sharybin [Thu, 4 Aug 2011 16:52:26 +0000 (16:52 +0000)]
Merging r38993 through r39028 from trunk into sox-2011-tomato

9 years agoCamera tracking integration
Sergey Sharybin [Thu, 4 Aug 2011 16:06:24 +0000 (16:06 +0000)]
Camera tracking integration
===========================

- Request from Sebastian/Francois: default lens
  for clip set to 24.0
- Added some additional camera presets from Francois request.
  Not sure all things from GENERIC section of that request
  would be actually useful.

  Probably the whole sensor size workflow would be changed...

9 years agoCamera tracking integration
Sergey Sharybin [Thu, 4 Aug 2011 15:40:28 +0000 (15:40 +0000)]
Camera tracking integration
===========================

- Added function to calculate per-track average error.
  Made this in libmv c-api, probably should be ported
  to libmv pipeline.
- MovieTrackingTrack now holds average reprojection error
  which is displayed in Active Track panel and information
  text in clip editor (if displaying of names are enabled).
- Make "Clean Tracks" take average error on account.

9 years agoCamera tracking integration
Sergey Sharybin [Thu, 4 Aug 2011 14:39:37 +0000 (14:39 +0000)]
Camera tracking integration
===========================

- Fixed bug with resetting marker's flag for non-transforming
  tracks when canceling transformation.
- Fixed bug with keyframing non-selected tracks when initializing
  tracking tools.
- Changed selection policy: now invisible parts of marker
  can be selected.
- Added operator redo panel to Clip Editor.
- Set Scale operator now uses operator property for scale.
- Added operator "Clean Tracks" which currently checks if tracks
  are tracked long enough and can select bad tracks, delete them
  or delete tracking segments which are too short.

9 years agofix for building with clang. makesrna wasnt linking with sqrt
Campbell Barton [Thu, 4 Aug 2011 13:22:38 +0000 (13:22 +0000)]
fix for building with clang. makesrna wasnt linking with sqrt

9 years agoTypo when reading line curving. The subversion is 1, so smaller than 1 should be...
Jeroen Bakker [Thu, 4 Aug 2011 12:19:50 +0000 (12:19 +0000)]
Typo when reading line curving. The subversion is 1, so smaller than 1 should be converted

9 years agoremove append to cursor code, wasnt used and made some naive assumptions about object...
Campbell Barton [Thu, 4 Aug 2011 11:27:13 +0000 (11:27 +0000)]
remove append to cursor code, wasnt used and made some naive assumptions about object locations.

9 years agoUserPref/Node editor feature: Change the level of noodle curving.
Jeroen Bakker [Thu, 4 Aug 2011 10:05:14 +0000 (10:05 +0000)]
UserPref/Node editor feature: Change the level of noodle curving.

Some people like curved lines, other hate them. This commit will let the user change the level of curving.

In UserPreferences=>Themes=>Node editor=>Noodle curving the level can be modified. Allowed range is 0-10 with the default on 5

The patch will default everything to the way blender works ATM.
File subversion has been increased otherwise older 258 files got straight lines.

The data is stored in the ThemeSpace.noodle_curving
the bezierdrawing is done in the drawnode. Also tested the Line cut tool

9 years agorst API doc fixes: literalincluding bge.texture and bge.constraints examples + bgl...
Dalai Felinto [Thu, 4 Aug 2011 09:47:40 +0000 (09:47 +0000)]
rst API doc fixes: literalincluding bge.texture and bge.constraints examples + bgl fixes

9 years agowhen appending with a NULL context dont print warnigns about scene not being set...
Campbell Barton [Thu, 4 Aug 2011 09:47:09 +0000 (09:47 +0000)]
when appending with a NULL context dont print warnigns about scene not being set - was annoying for BGE LibLoad.

9 years agopatch from jensverwiebe to disable ndof if header is not found.
Campbell Barton [Thu, 4 Aug 2011 08:46:17 +0000 (08:46 +0000)]
patch from jensverwiebe to disable ndof if header is not found.

9 years agostricter guards for disabling NDOF code (will test in 3.. 2.. 1..)
Mike Erwin [Thu, 4 Aug 2011 03:14:00 +0000 (03:14 +0000)]
stricter guards for disabling NDOF code (will test in 3.. 2.. 1..)

9 years agofix [#28114] Render Crash
Campbell Barton [Thu, 4 Aug 2011 01:56:36 +0000 (01:56 +0000)]
fix [#28114] Render Crash

existing check for driver to use GIL was not thread safe and could cause, details in the report.

This bug was caused by a check to avoid hanging, a fix for [#27683] that worked in 2.4x because the UI didn't use python to draw while rendering.

Apply a different fix for [#27683], when calling an operator, call PyEval_SaveThread(), then PyEval_RestoreThread() so the GIL can be aquired by threads started by the operator - in this case bake starting a thread that evaluates drivers.

9 years agoCamera tracking integration
Sergey Sharybin [Wed, 3 Aug 2011 19:05:58 +0000 (19:05 +0000)]
Camera tracking integration
===========================

- Fixed crash when Display->Stable is enabled before
  loading clip.
- Fixed bug with location influence on stabilization data.

9 years agoCamera tracking integration
Sergey Sharybin [Wed, 3 Aug 2011 18:28:40 +0000 (18:28 +0000)]
Camera tracking integration
===========================

- Made naming in libmv-api more uniform.
- Move aspect ration detection of clip to movieclip.c.
- Remove unused width and height from camera intrinsics function.
- Reconstruction should now deal correct with aspect ratio.

9 years agoAdd .py extension if it is missing from keymap file.
Kent Mein [Wed, 3 Aug 2011 17:58:06 +0000 (17:58 +0000)]
Add .py extension if it is missing from keymap file.

This is for bug #28141
While not really a bug, it makes it a lot easyer to use if it
has the exension.  (Isn't hidden from the user when they try to load it...)

Kent

9 years agoMerging r38988 through r38992 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 3 Aug 2011 16:39:16 +0000 (16:39 +0000)]
Merging r38988 through r38992 from trunk into soc-2011-tomato

9 years agoCrash in MMB moves (etc): commit of today was reading NULL pointer.
Ton Roosendaal [Wed, 3 Aug 2011 14:21:49 +0000 (14:21 +0000)]
Crash in MMB moves (etc): commit of today was reading NULL pointer.

9 years agoenable NDOF by default with cmake again, but check if it can be found on OSX, if...
Campbell Barton [Wed, 3 Aug 2011 14:18:02 +0000 (14:18 +0000)]
enable NDOF by default with cmake again, but check if it can be found on OSX, if not disable.

I cant test this but at least if I made a mistake it will just not find the SDK and disable. an osx dev needs to test.

9 years agoDefault to False for WITH_BF_3DMOUSE, since needs separate package installed.
Nathan Letwory [Wed, 3 Aug 2011 14:04:48 +0000 (14:04 +0000)]
Default to False for WITH_BF_3DMOUSE, since needs separate package installed.

9 years agoCamera tracking integration
Sergey Sharybin [Wed, 3 Aug 2011 14:04:33 +0000 (14:04 +0000)]
Camera tracking integration
===========================

Get rid of cachin logic in seqcache, switch it to use logic
from movie clip. Now only hash calculation and comparator
functions are declared in seqcache.

9 years agoMerging r38951 through r38987 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 3 Aug 2011 14:02:08 +0000 (14:02 +0000)]
Merging r38951 through r38987 from trunk into soc-2011-tomato

9 years agoCmake: compile with NDOF default off. This is a dependency on code
Ton Roosendaal [Wed, 3 Aug 2011 13:31:33 +0000 (13:31 +0000)]
Cmake: compile with NDOF default off. This is a dependency on code
that's not in our svn.

9 years agoAdd win64_scons builder
Nathan Letwory [Wed, 3 Aug 2011 13:00:11 +0000 (13:00 +0000)]
Add win64_scons builder

9 years agoAdd BF_BITNESS for win32/win64
Nathan Letwory [Wed, 3 Aug 2011 12:57:38 +0000 (12:57 +0000)]
Add BF_BITNESS for win32/win64

9 years agoFixing terrible typo.
Sergey Sharybin [Wed, 3 Aug 2011 12:20:07 +0000 (12:20 +0000)]
Fixing terrible typo.

9 years agoSwitch slave_pack to use new FFmpeg for windows.
Sergey Sharybin [Wed, 3 Aug 2011 11:47:03 +0000 (11:47 +0000)]
Switch slave_pack to use new FFmpeg for windows.

9 years agoSwitch windows buildbot to new FFmpeg 0.8.1.
Sergey Sharybin [Wed, 3 Aug 2011 11:10:19 +0000 (11:10 +0000)]
Switch windows buildbot to new FFmpeg 0.8.1.
Hope it'll work because i haven't got buildbot slave by hand.

9 years ago- Move list of FFmpeg DLLs to be installed from SConstruct
Sergey Sharybin [Wed, 3 Aug 2011 10:50:21 +0000 (10:50 +0000)]
- Move list of FFmpeg DLLs to be installed from SConstruct
  to conficuration variable BF_FFMPEG_DDL.
  This would allow to use different FFmpeg in buildbot.
- Added some 3DMOUSE variables to list of command line options.
  Now 3dmouse related-settings can be set from command line.

9 years agofix [#27965] VSE: no visual feedback on locked strips
Campbell Barton [Wed, 3 Aug 2011 09:28:16 +0000 (09:28 +0000)]
fix [#27965] VSE: no visual feedback on locked strips
added xpm -> opengl stipple conversion script.

9 years ago- Switch linux buildbot to FFmpeg-0.8.1
Sergey Sharybin [Wed, 3 Aug 2011 09:07:30 +0000 (09:07 +0000)]
- Switch linux buildbot to FFmpeg-0.8.1
- Enable FFmpeg for blenderplayer for linux buildbot.

9 years agofix [#28135] Edge slide changes UV
Campbell Barton [Wed, 3 Aug 2011 08:02:32 +0000 (08:02 +0000)]
fix [#28135] Edge slide changes UV

9 years ago- Do not add GHOST_NDOFManager.cpp to list of sources if
Sergey Sharybin [Wed, 3 Aug 2011 07:30:24 +0000 (07:30 +0000)]
- Do not add GHOST_NDOFManager.cpp to list of sources if
  NDOF is disabled in CMake.
- Added "default" section to switch in sendMotionEvent.
  It's what strict gcc rules don't like much and it's
  And it's good practice in general, imo.

9 years agoDebug print removed.
Nathan Letwory [Wed, 3 Aug 2011 07:08:28 +0000 (07:08 +0000)]
Debug print removed.

9 years agoremoved attempted WITH_BF_3DMOUSE detection, fixed just one indention (left the other...
Mike Erwin [Wed, 3 Aug 2011 06:42:55 +0000 (06:42 +0000)]
removed attempted WITH_BF_3DMOUSE detection, fixed just one indention (left the others in their ugly new state)

9 years agoadd note in scene.frame_current that frace_set() updates animation data.
Campbell Barton [Wed, 3 Aug 2011 06:30:19 +0000 (06:30 +0000)]
add note in scene.frame_current that frace_set() updates animation data.

9 years agowhitespace edits.
Campbell Barton [Wed, 3 Aug 2011 06:27:44 +0000 (06:27 +0000)]
whitespace edits.

9 years agofix [#28151] export OBJ don't save the extension
Campbell Barton [Wed, 3 Aug 2011 05:32:07 +0000 (05:32 +0000)]
fix [#28151] export OBJ don't save the extension
also correct some typos

9 years agocompensate for lack of 3D mouse calibration on Windows
Mike Erwin [Wed, 3 Aug 2011 05:01:55 +0000 (05:01 +0000)]
compensate for lack of 3D mouse calibration on Windows

9 years agotypo fix.
Nathan Letwory [Tue, 2 Aug 2011 23:52:07 +0000 (23:52 +0000)]
typo fix.

9 years agoCompile fix.
Nathan Letwory [Tue, 2 Aug 2011 23:49:07 +0000 (23:49 +0000)]
Compile fix.

9 years agondof changes: turned off 3D mouse during transform, removed timing bug in image/uv...
Mike Erwin [Tue, 2 Aug 2011 22:50:06 +0000 (22:50 +0000)]
ndof changes: turned off 3D mouse during transform, removed timing bug in image/uv, added option for zoom axis (up/down vs. forward/backward)

9 years agoPatch by oenvoyage - olivier amrein, thanks a lot!
Thomas Dinges [Tue, 2 Aug 2011 18:56:03 +0000 (18:56 +0000)]
Patch by oenvoyage  - olivier amrein, thanks a lot!
* Material Diffuse Ramp was not greyed out when shadeless was enabled.

9 years agoSimple argument to be able to explicitely tell the bitness you want to build Blender in.
Nathan Letwory [Tue, 2 Aug 2011 18:33:39 +0000 (18:33 +0000)]
Simple argument to be able to explicitely tell the bitness you want to build Blender in.

python scons\scons.py BF_BITNESS=32
python scons\scons.py BF_BITNESS=64

So from now on for Windows you don't have to run a specific win32 or win64 Python version
to get the Blender version you want. If you omit the BF_BITNESS flag the bitness as per
Python version will be used as before.

Note that this is an argument, so works *only* on the command-line, not in your user-config.py

9 years agoMerging r38941 through r38950 from trunk into sox-2011-tomato
Sergey Sharybin [Tue, 2 Aug 2011 18:28:05 +0000 (18:28 +0000)]
Merging r38941 through r38950 from trunk into sox-2011-tomato

9 years agoCamera tracking integration
Sergey Sharybin [Tue, 2 Aug 2011 18:25:18 +0000 (18:25 +0000)]
Camera tracking integration
===========================

- Fixed some silly things ni DNA design. Now all
  reconstruction data is stored in Tracking->Reconstruction.
  Please, re-solve your cameras -- reconstruction data
  wouldn't be read from files saved in blender below this
  commit.
- RNA accessors for reconstruction data.
- Store average reconstruction error in new reconstruction
  structure and show it in clip editor header after
  reconstruction.
- Highlight failed to reconstruct frames with red in cache line.
- Added "group" "Failed Tracks" in Select Grouped operator,
  Meant to be used for selecting tracks bundles from which
  failed to to be solved.
- Hotkey to delete marker: Shift-X.
- Jump to next/prev failed frame operator. Hotkeys are
  Ctrl-Shift-Left/Right Arrow.

9 years agoChanges for buildbot rules to use propper spnav library path.
Sergey Sharybin [Tue, 2 Aug 2011 18:16:48 +0000 (18:16 +0000)]
Changes for buildbot rules to use propper spnav library path.

9 years agoMore flexible configuration for 3dmouse library for scons.
Sergey Sharybin [Tue, 2 Aug 2011 17:59:43 +0000 (17:59 +0000)]
More flexible configuration for 3dmouse library for scons.
Needed for release environment and buildbot.

Buildbot rules would be updated with next commit after
environment will be tested.

9 years agofix for xvid encoding preset giving a python error
Campbell Barton [Tue, 2 Aug 2011 17:40:27 +0000 (17:40 +0000)]
fix for xvid encoding preset giving a python error

9 years agoFixes an issue with OSX Lion
Kent Mein [Tue, 2 Aug 2011 17:35:07 +0000 (17:35 +0000)]
Fixes an issue with OSX Lion
Also cleaned up the python detection for OSX

Kent

9 years agoMerging r38898 through r38940 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 2 Aug 2011 17:32:19 +0000 (17:32 +0000)]
Merging r38898 through r38940 from trunk into soc-2011-tomato

9 years agoFixed a few small typos.
Kent Mein [Tue, 2 Aug 2011 17:00:44 +0000 (17:00 +0000)]
Fixed a few small typos.

Kent

9 years agotypo fix
Nathan Letwory [Tue, 2 Aug 2011 14:45:35 +0000 (14:45 +0000)]
typo fix

9 years agounit arg for FloatVectorProeprty
Campbell Barton [Tue, 2 Aug 2011 10:56:09 +0000 (10:56 +0000)]
unit arg for FloatVectorProeprty

9 years agoDon't include NDOF files when disabled.
Nathan Letwory [Tue, 2 Aug 2011 10:50:22 +0000 (10:50 +0000)]
Don't include NDOF files when disabled.

9 years agoSome more silencing. Enable with BF_GHOST_DEBUG
Nathan Letwory [Tue, 2 Aug 2011 10:39:46 +0000 (10:39 +0000)]
Some more silencing. Enable with BF_GHOST_DEBUG

9 years agoIndentation changes
Nathan Letwory [Tue, 2 Aug 2011 10:26:20 +0000 (10:26 +0000)]
Indentation changes

9 years agofix [#28148] User Preferences Scripts Path not working
Campbell Barton [Tue, 2 Aug 2011 10:21:25 +0000 (10:21 +0000)]
fix [#28148] User Preferences Scripts Path not working

9 years agoProperly disable NDOF code when WITH_INPUT_NDOF is not define.
Nathan Letwory [Tue, 2 Aug 2011 10:20:47 +0000 (10:20 +0000)]
Properly disable NDOF code when WITH_INPUT_NDOF is not define.

9 years agowhitespace
Nathan Letwory [Tue, 2 Aug 2011 09:36:44 +0000 (09:36 +0000)]
whitespace

9 years agoDebug print removed.
Nathan Letwory [Tue, 2 Aug 2011 09:18:21 +0000 (09:18 +0000)]
Debug print removed.

9 years agoDon't show NDOF guide by default.
Nathan Letwory [Tue, 2 Aug 2011 09:12:58 +0000 (09:12 +0000)]
Don't show NDOF guide by default.

9 years agoTurn off ndof button debug
Nathan Letwory [Tue, 2 Aug 2011 09:09:07 +0000 (09:09 +0000)]
Turn off ndof button debug

9 years agotabs -> spaces
Nathan Letwory [Tue, 2 Aug 2011 09:07:24 +0000 (09:07 +0000)]
tabs -> spaces

9 years ago3D Mouse support on for windows/msvc by default.
Nathan Letwory [Tue, 2 Aug 2011 09:06:55 +0000 (09:06 +0000)]
3D Mouse support on for windows/msvc by default.

9 years agono functional changes.
Campbell Barton [Tue, 2 Aug 2011 08:12:50 +0000 (08:12 +0000)]
no functional changes.
style edits, also renamed ndof_to_angle_axis --> ndof_to_axis_angle

9 years agoadd back timer based redraw, not sure why this was removed r38908.
Campbell Barton [Tue, 2 Aug 2011 07:49:34 +0000 (07:49 +0000)]
add back timer based redraw, not sure why this was removed r38908.
Zealous redraws now use commented define.

9 years agoMade wmNDOFMotionData use a vector rather then xyz members, makes it nicer to use...
Campbell Barton [Tue, 2 Aug 2011 07:08:22 +0000 (07:08 +0000)]
Made wmNDOFMotionData use a vector rather then xyz members, makes it nicer to use with math functions.

ndof_to_angle_axis and ndof_to_quat now use math functions.

9 years ago - Blender could be build with scons again.
Jiri Hnidek [Tue, 2 Aug 2011 07:02:40 +0000 (07:02 +0000)]
 - Blender could be build with scons again.

9 years agoreplace WM_OT_ndof_menu with a key->menu assignment.
Campbell Barton [Tue, 2 Aug 2011 06:40:40 +0000 (06:40 +0000)]
replace WM_OT_ndof_menu with a key->menu assignment.

9 years agomore cmake/x11 edits
Campbell Barton [Tue, 2 Aug 2011 06:32:53 +0000 (06:32 +0000)]
more cmake/x11 edits
- added includes for spnav
- added FindSpacenav.cmake which allows using spacenav from a nonstandard path.
- remove NDOF_LIBPATH, use a full library path instead.

9 years agoNDOF related edits
Campbell Barton [Tue, 2 Aug 2011 05:52:27 +0000 (05:52 +0000)]
NDOF related edits
- fix for building without NDOF on X11
- quiet some warnings

9 years agoSVN maintenance.
Guillermo S. Romero [Tue, 2 Aug 2011 05:31:32 +0000 (05:31 +0000)]
SVN maintenance.

9 years ago3D mouse support from merwin-spacenav branch
Mike Erwin [Tue, 2 Aug 2011 04:28:05 +0000 (04:28 +0000)]
3D mouse support from merwin-spacenav branch

9 years agodon't include fcurve modifiers when getting an actions frame range.
Campbell Barton [Tue, 2 Aug 2011 02:28:37 +0000 (02:28 +0000)]
don't include fcurve modifiers when getting an actions frame range.
could too easily give a range of 600,000 which would make exporters hang.

9 years agosvn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender . merwin-spacenav
Mike Erwin [Tue, 2 Aug 2011 01:01:56 +0000 (01:01 +0000)]
svn merge -r38814:38905 https://svn.blender.org/svnroot/bf-blender/trunk/blender .

9 years agoCamera tracking integration
Sergey Sharybin [Mon, 1 Aug 2011 15:28:19 +0000 (15:28 +0000)]
Camera tracking integration
===========================

- Do not show frame boundary border when stabilization isn't enabled.
- Separate stabilization settings from display in clip editor.
  Now clip can contain stabilization data but still be displayed
  un-stabilized in clip editor.
- Internal changes in stabilization:
  * Use separated location/scale parameters rather than 4x4 matrix.
    In some ares "decomposed" data is needed (text draw functions, i.e.).
    Also such decomposed data could be used in compositor.
  * MovieClip now uses own structure for cache where additional data
    can be stored. MovieCache structure now one of properties in
    this new structure.
  * Get rid of stable image buffer stored in MovieClipStabilization
    structure. Pre-created buffer for scaling still stored there.
    This helps to keep playback realtime -- re-creating this buffer
    introduces ~15% slowdown.
- Added sliders to 2D stabilization panel which controls intensity
  of translation/scale which applies on shot.
- Added filter type to Stabilize2D compositor node. Supports nearest,
  bilinear and bicubic interpolation.
- After discussion with Sebastian and Francois added new node called
  Transformation. It can apply translation, rotation and scale. It's
  not the same thing as applying this components separately -- all
  transformation is happening inside "canvas". And it should be more
  accurate on interpolation and sub-pixel translation.
  Need to check order of applying translation/scale/rotation btw.
- Added output sockets to movie clip compositor node. They holds
  stabilization data which can be used by Translate or Transform
  nodes.
- Minor fix of UI issues in Display panel.

9 years agoMerging r38832 through r38897 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 1 Aug 2011 15:24:15 +0000 (15:24 +0000)]
Merging r38832 through r38897 from trunk into soc-2011-tomato

9 years agofix [#28061] Texture (paint) bleeding on edges
Campbell Barton [Mon, 1 Aug 2011 08:53:57 +0000 (08:53 +0000)]
fix [#28061] Texture (paint) bleeding on edges
respect clamp u/v image options.

9 years agoCamera tracking integration
Sergey Sharybin [Mon, 1 Aug 2011 08:29:17 +0000 (08:29 +0000)]
Camera tracking integration
===========================

- If "Zoom To Mouse" is enabled in user preferences then
  zooming would happen to mouse position in clip editor.
- Fixed 1px padding from shot boundary rectangle.
- Allow for some operators grab cursor.
- Enlarge marker anchor sliding area and make it prioritized
  on pattern/search slide zones,

9 years agofix for template
Campbell Barton [Mon, 1 Aug 2011 06:55:05 +0000 (06:55 +0000)]
fix for template

9 years agofix [#28112] Vertex paint crash
Campbell Barton [Mon, 1 Aug 2011 06:50:24 +0000 (06:50 +0000)]
fix [#28112] Vertex paint crash

9 years agoadd sse flags for cmake/msvc
Campbell Barton [Mon, 1 Aug 2011 06:11:41 +0000 (06:11 +0000)]
add sse flags for cmake/msvc

9 years agofix, uvproject modifier wasn't copying the uv layer name,
Campbell Barton [Mon, 1 Aug 2011 05:25:30 +0000 (05:25 +0000)]
fix, uvproject modifier wasn't copying the uv layer name,
also edit var names from recent commit to better fit with other functions.

9 years agoreplace dutch variable name 'aantal' with 'tot'
Campbell Barton [Mon, 1 Aug 2011 02:58:44 +0000 (02:58 +0000)]
replace dutch variable name 'aantal' with 'tot'

9 years agofix for failure to create curve knots when both endpoint and bezier U were enabled.
Campbell Barton [Mon, 1 Aug 2011 02:52:08 +0000 (02:52 +0000)]
fix for failure to create curve knots when both endpoint and bezier U were enabled.
use default when invalid settings given.

removed odd/annoying bit shifting of the flagu/v for such basic function made code hard to understand and would fail if new flags were added.

9 years agosupport for older SpacePilot (sans Pro), minor tidying
Mike Erwin [Sun, 31 Jul 2011 22:59:36 +0000 (22:59 +0000)]
support for older SpacePilot (sans Pro), minor tidying

9 years agoBug fix: loading a file that had particles using a dupligroup from a liblinked file...
Janne Karhu [Sun, 31 Jul 2011 16:26:02 +0000 (16:26 +0000)]
Bug fix: loading a file that had particles using a dupligroup from a liblinked file without the library file being present crashed

9 years agofix for error in recent commit.
Campbell Barton [Sun, 31 Jul 2011 12:46:34 +0000 (12:46 +0000)]
fix for error in recent commit.

9 years agofix for material slot removal (r38879)
Campbell Barton [Sun, 31 Jul 2011 12:43:41 +0000 (12:43 +0000)]
fix for material slot removal (r38879)
- The object ID was being passed to the data_delete_material_index_id() from object_remove_material_slot(), rather then the object data. (so the material slot fix wouldnt run in that case).
- add support for fixing text object materials too.

9 years agoreverting part of #38876 (whitespace edits)
Dalai Felinto [Sun, 31 Jul 2011 11:21:48 +0000 (11:21 +0000)]
reverting part of #38876 (whitespace edits)
the new if/else nesting introduced in the previous commit makes no sense.
(since I was here I add a comment for extrainfo and did some small cleanup)

9 years agobugfix [#28111] material.pop breaks mt->mat_nr
Dalai Felinto [Sun, 31 Jul 2011 11:12:38 +0000 (11:12 +0000)]
bugfix [#28111] material.pop breaks mt->mat_nr

create a new parameter for materials.pop() to not remove material slot.
this way the mat_nr is still the old one.

for the default behaviour we now have material remapping (i.e. data_delete_material_index_id(id, index)).
This new function is brought from the material_slot remove function.

9 years agowhen converting curves from poly -> nurbs, dont enable Bezier-U flag.
Campbell Barton [Sun, 31 Jul 2011 07:58:50 +0000 (07:58 +0000)]
when converting curves from poly -> nurbs, dont enable Bezier-U flag.

Not sure why this was enabled, possibly from copy/paste with bezier->nurbs code?

If you have meny poly lines there was no nice way to convert these into a smoothed nurbs curve.
Ran into this when trying to convert generated ivy into smooth nurbs.