Commit Graph

2176 Commits

Author SHA1 Message Date
5da894b1fe misc edits
- cmake/windows was installing locale & font when internationalization was disabled, twice when enabled.
- file selector was using the string size-1, where this isn't needed since string buttons expected this value to be the sizeof(), accounting for '\0'.
- use const char for extension checking funcs.
- minor pep8 edits
2011-10-15 05:01:47 +00:00
9f8608a8ec svn merge ^/trunk/blender -r40950:40997, bmesh is in sync with head again 2011-10-14 01:49:37 +00:00
4e118bb22f svn merge ^/trunk/blender -r40890:40950 2011-10-14 01:35:20 +00:00
7eadd540d4 svn merge ^/trunk/blender -r40872:40890 2011-10-13 22:50:01 +00:00
8be3249537 Merge with trunk r40991 2011-10-13 21:43:02 +00:00
8bf78d7f56 Dynamic Paint:
* Fix: Wave "timescale" also changed simulation behavior. Now different timescale values will lead to nearly identical results, just slower or faster.
* Added "Displace Factor" setting for vertex displace surfaces. You can use it to adjust final displace strength or use negative values to paint bumps.
* Added clamp/map value to wave image sequence output settings.
* RNA description tweaking.
* General code tweaking.
2011-10-13 20:00:22 +00:00
7360f64a51 radius interpolation was incorrectly greyed out for 2D curves. 2011-10-13 06:07:11 +00:00
5a3540f4d8 Fixes for #26837: MPEG Preseek does not work for some h264 files.
- Display running job template in all sequencer modes
  It was displayed only for sequencer mode without preview.
- Fixed proxy rebuild progress indicator
  It was alsways zero because of incorrect rounding.
- Fixed timecode saving on windows (and probably some other platforms)
  It was caused by incorrect opening file for writting -- it should
  be opened in binary format "wb". This error caused incorrect
  movie duration detection on windows.
- Fixed movie resolution detection for some movies.
  In file attached to report, Blender detected resolution 1920x1088
  instead of 1920x1080. Not sure if this fix is correct or it's
  issue in FFmpeg, but it's something what mplayer using: store
  width/height before running avcodec_open().
- Fixed frame number calculation when building timecodes.
  It was rounding error caused some frames be positioned incorrect
  in several cases (that each 6th frame rendered as next frame
  from report).
2011-10-12 12:49:45 +00:00
50a851b946 python UI was doing a lot of attribute lookups on tool & sculpt tool (not especially efficient & annoying when adding breakpoints into why its not working right). 2011-10-12 00:47:50 +00:00
d546002476 Merged changes in the trunk up to revision 40911.
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2011-10-10 21:15:11 +00:00
ac1e737aa8 correct operator name from my own recent changes and edit navmesh rna prop name for consistency 2011-10-10 10:24:26 +00:00
2de1bd7dc5 updates to navmesh
- 2 new navmesh operators, reset and clear navmesh data.
- rename operators to be more consistent with existing names.
- some minor edits to draw function, was getting the custom data for every index when it already had the array.
2011-10-10 07:21:42 +00:00
17b66b46ad fix crash for recent navmesh edits when setting a non-mesh object to a navmesh.
also minor cleanup.
2011-10-09 21:43:13 +00:00
7306eb84f0 move NavMesh draw code out of being a modifier and into DerivedMesh drawing hack (which IMHO is less bad then mis-using a modifier only to override drawing calls). 2011-10-09 21:11:51 +00:00
aa6d7ebd14 svn merge ^/trunk/blender -r40720:40872 2011-10-09 07:31:15 +00:00
8695bedda2 svn merge ^/trunk/blender -r40644:40720 2011-10-06 16:59:58 +00:00
226d3a87d2 Object Menu Edits:
- add quick effects to object menu, these are too useful to hide in search menu.
- set/clear track/parent - expand the operators enums in submenus - no advantage in having a further popup after clicking on the menu item.
- move 'Join UVs' into Make links menu which is currently being abused to store some copy functions. Do this because the 'Object' menu is getting too big.
2011-10-06 05:45:06 +00:00
6c64286cab Moved line set options into a new separate "Freestyle: Line Set" tab
in the Render buttons.
2011-10-06 02:14:33 +00:00
f84e8e7640 Fine control of feature edge selection with mesh face and edge marks.
New "face marks" and "edge marks" have been introduced in mesh data
blocks.  In the edit mode of a mesh object, face marks can be put
to selected faces by choosing Mesh >> Faces >> Mark Freestyle Face
from the menu of a 3D View window or Ctrl-F >> Mark Freestyle Face
from the context menu.  Similarly, edge marks can be put to selected
edges by Mesh >> Edges >> Mark Freestyle Edge or Ctrl-E >> Mark
Freestyle Edge.  These marks should work fine with the Subdivision
surface modifier.

Moreover, two new conditions for feature edge selection have been
added to the Parameter Editor mode as described below:

1. The Selection by Edge Types option has now the new Edge Mark type,
which can be used to (de)select feature edges having edge marks.
This option can be used to add to (or remove from) the view map
arbitrary edges of mesh objects.

2. Selection by Face Marks option has been newly introduced, in which
face marks are used for feature edge selection in two ways.  One
option is called "One Face" which is to (de)select feature edges if
one of faces on the left and right of each feature edge has a face
mark.  The other option is "Both Faces" to (de)select feature edges
if both faces on the left and right have a face mark.
2011-10-06 02:04:43 +00:00
f618bc5aca Fix #28202: (only) modifying keymap item properties did not save properly, the
update signal for this was missing. Problem is that the operator properties
RNA update callback doesn't know the associated keymap item, worked around it
with UI template now.
2011-10-04 13:24:48 +00:00
e8bb972f3c Merge with trunk r40782 2011-10-04 11:42:44 +00:00
8b0e44c66e fix for own recent commit made color strip use the wrong panel, now hide Input rather then effects since the color picker wasnt shown. 2011-10-03 03:23:50 +00:00
ccb7a81d86 - fix for keymap test operator
- cleanup pep8 warnings and unused py imports
py pep8 cleanup
2011-10-02 18:09:36 +00:00
fdcfb9a4a0 * Updating readme.html and link to release logs for 2.60, now that we approach the RC state. 2011-10-01 11:21:47 +00:00
113d556295 patch [#28571]
from Bastien Montagne (mont29)

Only applied Sequencer Select Grouped functionality - similar to the one in object mode, select strips based on type, time, data etc.
2011-09-28 14:12:27 +00:00
4158cee688 color strip was showing image crop and and offset twice, also made 'Make Metastrip' key shortcut Ctrl+G (so shift+G can be used for select group like object mode) 2011-09-28 08:03:02 +00:00
4a157de23d svn merge ^/trunk/blender -r40587:40643 2011-09-28 07:34:48 +00:00
dcccf3fc1f navmesh: solve bad level calls to edit mesh functions
Move navmesh operators from editors/object to editors/mesh
2011-09-27 09:09:52 +00:00
effea8c29b svn merge ^/trunk/blender -r40511:40587 2011-09-27 03:12:31 +00:00
fbdfdfefd8 use BLI_snprintf rather than sprintf for interface functions 2011-09-26 16:53:04 +00:00
8a423f59ea pep8 cleanup and fix for keymap test operator from my own recent fix. 2011-09-26 15:39:15 +00:00
e1e5371335 fix for keymap export, move functions common for the UI and operators into bpy_extras.keymap_utils 2011-09-26 11:22:07 +00:00
573ed73be8 change define INTERNATIONAL --> WITH_INTERNATIONAL
also rename backface_culling --> use_backface_culling (which is used elsewhere in rna)
2011-09-26 10:35:47 +00:00
Dalai Felinto
11a0e00819 BGE Material settings renaming Back Culling to Backface Culling and make it on by default
under suggestion of Mitchell Stokes (Moguri)
2011-09-26 06:39:19 +00:00
Alex Fraser
558b646216 Committing patch #27442: Adaptive time step for fluid particles. The number of
subframes can now be altered automatically while an SPH (fluid particle)
simulation is running.
2011-09-25 11:51:28 +00:00
81f7e361d2 make new rna variables more consistant with existing names. 2011-09-25 02:49:46 +00:00
c0c488d0b2 Merged changes in the trunk up to revision 40520. 2011-09-24 21:39:11 +00:00
d7a5429f42 svn merge ^/trunk/blender -r40491:40498 2011-09-23 13:55:06 +00:00
c658b74db5 minor edits to recent fix for addons 2011-09-23 13:47:29 +00:00
38132d68d6 fix script error and quiet warnings about "." description ending. 2011-09-23 13:31:48 +00:00
f7c8ea702f * Some more fixes for recent move operator commit. 2011-09-23 13:29:28 +00:00
9494340dae svn merge ^/trunk/blender -r40432:40491 2011-09-23 13:04:01 +00:00
75e7f63322 svn merge ^/trunk/blender -r40431:40432 2011-09-23 11:47:53 +00:00
5bd83eede0 svn merge ^/trunk/blender -r40405:40431 2011-09-23 11:30:55 +00:00
460cde345b svn merge ^/trunk/blender -r40394:40395 2011-09-23 10:43:25 +00:00
a13f94865a svn merge ^/trunk/blender -r40371:40372 2011-09-23 05:59:37 +00:00
e17ee1b415 2.6 Python UI files:
* Moved Operators from bl_ui into bl_operators.
* Renamed HELP_OT_operator_cheat_sheet to WM_OT_operator_cheat_sheet.
2011-09-22 19:50:41 +00:00
7126a4699e svn merge ^/trunk/blender -r40367:40368 --- raddish weight paint merge 2011-09-22 16:09:27 +00:00
cf46edfcbc correction for removal of _("") 2011-09-22 07:01:28 +00:00
14475d07cd svn merge -r40295:40367 ^/trunk/blender 2011-09-21 17:15:54 +00:00