blender.git
7 years agoBugfix: Crash in Sequencer when trying to undo after using Grease Pencil
Joshua Leung [Mon, 11 Jun 2012 03:03:36 +0000 (03:03 +0000)]
Bugfix: Crash in Sequencer when trying to undo after using Grease Pencil

Grease Pencil data was not getting correctly relinked after file reload (for
undo)

7 years agoSVN maintenance.
Guillermo S. Romero [Mon, 11 Jun 2012 02:29:25 +0000 (02:29 +0000)]
SVN maintenance.

7 years agoCommented out expand_bones(), as this wasn't actually doing anything other than
Joshua Leung [Mon, 11 Jun 2012 02:23:26 +0000 (02:23 +0000)]
Commented out expand_bones(), as this wasn't actually doing anything other than
wasting time traversing the list of bones in the Armature

7 years agoBuild-system fix (for r.47710)
Joshua Leung [Mon, 11 Jun 2012 02:01:48 +0000 (02:01 +0000)]
Build-system fix (for r.47710)

Need add blenfont to list of include directories for sequence editor buildfiles.
Was causing build errors on OSX. Thanks Zavigny (IRC report)

7 years agoGrease Pencil Eraser - Numpad +/- and Scrollwheel Up/Down to change radius of
Joshua Leung [Mon, 11 Jun 2012 01:27:56 +0000 (01:27 +0000)]
Grease Pencil Eraser - Numpad +/- and Scrollwheel Up/Down to change radius of
brush while erasing

This makes it easier to change the size of the brush without having to jump out
to the User Preferences and back

7 years agoGrease Pencil - Eraser is drawn with the circle/brush indicator again
Joshua Leung [Mon, 11 Jun 2012 01:09:25 +0000 (01:09 +0000)]
Grease Pencil - Eraser is drawn with the circle/brush indicator again

7 years agoCode cleanup - Removing/commenting out various bits of legacy cruft related to
Joshua Leung [Mon, 11 Jun 2012 00:46:22 +0000 (00:46 +0000)]
Code cleanup - Removing/commenting out various bits of legacy cruft related to
old Grease Pencil stuff

7 years agoGrease Pencil - Support for Grease Pencil in the Sequence Editor preview/image
Joshua Leung [Mon, 11 Jun 2012 00:21:50 +0000 (00:21 +0000)]
Grease Pencil - Support for Grease Pencil in the Sequence Editor preview/image
space works again

This commit restores the support for using Grease Pencil in the Sequence Editor
image preview region, making it possible to scribble on footage for review
purposes again. Due to internal changes in how the Sequencer handles the image
drawing for this stuff (i.e. it is now fully based on View2D instead of trying
to implement its own little crazy offset+zoom stuff), a lot of the old code for
handling those offsets is no longer needed. Instead, one of the "standard" cases
is now used, and works quite well.

Bugfixes:
* View-space Grease Pencil drawing was done in wrong place (before view2d
restore)
* Grease Pencil entry in RNA had wrong/missing type

Credits:
* DingTo - initial patch/attempt at restoring support
* Aligorith - solved the "offset problems"

7 years agoOUTLINER_OT_material_drop -- Drag & Drop materials onto objects in the outliner
Dan Eicher [Sun, 10 Jun 2012 22:22:26 +0000 (22:22 +0000)]
OUTLINER_OT_material_drop -- Drag & Drop materials onto objects in the outliner

Adds the material at materials + 1 unlike the DnD view3d one which replaces the first one

7 years agostyle cleanup
Campbell Barton [Sun, 10 Jun 2012 22:13:17 +0000 (22:13 +0000)]
style cleanup

7 years agofix [#31712] User prefs Input: Filter searches for names starting with entered phrase...
Campbell Barton [Sun, 10 Jun 2012 21:38:24 +0000 (21:38 +0000)]
fix [#31712] User prefs Input: Filter searches for names starting with entered phrase only

7 years agocorrect float vector sizes
Campbell Barton [Sun, 10 Jun 2012 20:31:01 +0000 (20:31 +0000)]
correct float vector sizes

7 years agoquiet warning
Campbell Barton [Sun, 10 Jun 2012 20:20:37 +0000 (20:20 +0000)]
quiet warning

7 years agocorrect freeing C++ arrays.
Campbell Barton [Sun, 10 Jun 2012 20:14:15 +0000 (20:14 +0000)]
correct freeing C++ arrays.

7 years agostyle cleanup
Campbell Barton [Sun, 10 Jun 2012 19:59:02 +0000 (19:59 +0000)]
style cleanup

7 years agoCommitting patch [#31704] "Patch to fix keyboard sensor from blocking quit game key...
Mitchell Stokes [Sun, 10 Jun 2012 19:32:57 +0000 (19:32 +0000)]
Committing patch [#31704] "Patch to fix keyboard sensor from blocking quit game key binding" by Jay Parker. This patch fixes [#31671] "Keyboard Sensor blocks Quit Game Key Binding"

7 years agoAlso fix cache line in clip editor which didn't take start frame into account.
Sergey Sharybin [Sun, 10 Jun 2012 17:24:05 +0000 (17:24 +0000)]
Also fix cache line in clip editor which didn't take start frame into account.

7 years agoFixed curves and dopeseet views of motion tracking data not taking clip's
Sergey Sharybin [Sun, 10 Jun 2012 17:09:35 +0000 (17:09 +0000)]
Fixed curves and dopeseet views of motion tracking data not taking clip's
start frame into account.

7 years agoForce multires update when changing subdivision type.
Nicholas Bishop [Sun, 10 Jun 2012 17:06:26 +0000 (17:06 +0000)]
Force multires update when changing subdivision type.

Fixes bug [#31050] Changing multires subdivision algorithm can ruin mesh

7 years agoCode cleanups for the PBVH, no functional changes.
Nicholas Bishop [Sun, 10 Jun 2012 16:37:22 +0000 (16:37 +0000)]
Code cleanups for the PBVH, no functional changes.

* Use the PBVHType consistently in pbvh_update_draw_buffers().

* Split the raycast function up, mesh and grid raycast get their own
  functions now.

* Replace duplicated code in BLI_pbvh_node_add_proxy() with call to
  BLI_pbvh_node_num_verts().

7 years agoBugfix for autosmooth in sculpt mode.
Nicholas Bishop [Sun, 10 Jun 2012 16:22:58 +0000 (16:22 +0000)]
Bugfix for autosmooth in sculpt mode.

This option was broken for non-multires meshes (not sure for how
long), as the pmap was not getting calculated.

Added a more general check for whether the pmap is needed, also added
an assert to warn about this in future.

7 years agoFix compilation without libmv
Sergey Sharybin [Sun, 10 Jun 2012 16:16:02 +0000 (16:16 +0000)]
Fix compilation without libmv

7 years agoBump subversion so iteration through all markers would happen
Sergey Sharybin [Sun, 10 Jun 2012 15:28:37 +0000 (15:28 +0000)]
Bump subversion so iteration through all markers would happen
only for old files which actually needs to be ported to 4 corners
representation.

7 years agoCommit patch from Stephan Kassemeyer sent to ML
Sergey Sharybin [Sun, 10 Jun 2012 15:28:29 +0000 (15:28 +0000)]
Commit patch from Stephan Kassemeyer sent to ML

This patch aims to solve unaligned operation assert
happens in Eigen library.

This is short-term solution which in fact shall be reverted
as soon as real solution would be added to Ceres. Meanwhile
this should be acceptable to have for a while.

7 years agoPlanar tracking support for motion tracking
Sergey Sharybin [Sun, 10 Jun 2012 15:28:19 +0000 (15:28 +0000)]
Planar tracking support for motion tracking
===========================================

Major list of changes done in tomato branch:

- Add a planar tracking implementation to libmv
  This adds a new planar tracking implementation to libmv. The
  tracker is based on Ceres[1], the new nonlinear minimizer that
  myself and Sameer released from Google as open source. Since
  the motion model is more involved, the interface is
  different than the RegionTracker interface used previously
  in Blender.

  The start of a C API in libmv-capi.{cpp,h} is also included.

- Migrate from pat_{min,max} for markers to 4 corners representation

  Convert markers in the movie clip editor / 2D tracker from using
  pat_min and pat_max notation to using the a more general, 4-corner
  representation.

  There is still considerable porting work to do; in particular
  sliding from preview widget does not work correct for rotated
  markers.

  All other areas should be ported to new representation:

  * Added support of sliding individual corners. LMB slide + Ctrl
    would scale the whole pattern
  * S would scale the whole marker, S-S would scale pattern only
  * Added support of marker's rotation which is currently rotates
    only patterns around their centers or all markers around median,

    Rotation or other non-translation/scaling transformation of search
    area doesn't make sense.

  * Track Preview widget would display transformed pattern which
    libmv actually operates with.

- "Efficient Second-order Minimization" for the planar tracker

  This implements the "Efficient Second-order Minimization"
  scheme, as supported by the existing translation tracker.
  This increases the amount of per-iteration work, but
  decreases the number of iterations required to converge and
  also increases the size of the basin of attraction for the
  optimization.

- Remove the use of the legacy RegionTracker API from Blender,
  and replaces it with the new TrackRegion API. This also
  adds several features to the planar tracker in libmv:

  * Do a brute-force initialization of tracking similar to "Hybrid"
    mode in the stable release, but using all floats. This is slower
    but more accurate. It is still necessary to evaluate if the
    performance loss is worth it. In particular, this change is
    necessary to support high bit depth imagery.

  * Add support for masks over the search window. This is a step
    towards supporting user-defined tracker masks. The tracker masks
    will make it easy for users to make a mask for e.g. a ball.

    Not exposed into interface yet/

  * Add Pearson product moment correlation coefficient checking (aka
    "Correlation" in the UI. This causes tracking failure if the
    tracked patch is not linearly related to the template.

  * Add support for warping a few points in addition to the supplied
    points. This is useful because the tracking code deliberately
    does not expose the underlying warp representation. Instead,
    warps are specified in an aparametric way via the correspondences.

- Replace the old style tracker configuration panel with the
  new planar tracking panel. From a users perspective, this means:

  * The old "tracking algorithm" picker is gone. There is only 1
    algorithm now. We may revisit this later, but I would much
    prefer to have only 1 algorithm. So far no optimization work
    has been done so the speed is not there yet.

  * There is now a dropdown to select the motion model. Choices:

        * Translation
        * Translation, rotation
        * Translation, scale
        * Translation, rotation, scale
        * Affine
        * Perspective

  * The old "Hybrid" mode is gone; instead there is a toggle to
    enable or disable translation-only tracker initialization. This
    is the equivalent of the hyrbid mode before, but rewritten to work
    with the new planar tracking modes.

  * The pyramid levels setting is gone. At a future date, the planar
    tracker will decide to use pyramids or not automatically. The
    pyramid setting was ultimately a mistake; with the brute force
    initialization it is unnecessary.

- Add light-normalized tracking

  Added the ability to normalize patterns by their average value while
  tracking, to make them invariant to global illumination changes.

Additional details could be found at wiki page [2]

  [1] http://code.google.com/p/ceres-solver
  [2] http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Motion_Tracker

7 years agoInitial Ceres integration into Blender
Sergey Sharybin [Sun, 10 Jun 2012 15:27:41 +0000 (15:27 +0000)]
Initial Ceres integration into Blender

Currently only put sources of Ceres library into extern/libmv/third_party and
setup CMake and SCons building systems.

Integration details:

- Even CMake build files are not re-used from Ceres's trunk: they're using some
  automatic stuff detection like glog, pthreads, protobuf and so and it's not
  so clear how to re-use that files without modifications.
  And IMO it's easier if build files are getting re-generated automatically to
  match Blender-specific setup rather than keeping changes made locally in
  Blender in sync when re-bundling Ceres library. Especially in case when it's
  already needed to support SCons build system.
- Integrated only actual sources, all tests were stripped. Probably it'll be nice
  to have them, but they'll need clear integration with current module test stuff
  in Blender.
- Suitesparse was disabled. It'll help a lot having it, but there are some difficulties
  making cholmod working fine on windows. Would be added in future
- collections_port.cc was also stripped. It's not used by Ceres's upstream and
  it gives compilation error (undefined uint32 -- looks like namespace issue).
- Currently all schur eliminators are included. Not sure if it makes sense,
  also not sure if it makes sense having them switchable on and off -- IMO better
  to have single configuration which works and does not require special tweaks
  after everything was set up.

To bundle updated version of Ceres:
- Go to extern/libmv/third_party/ceres folder
- Run ./bundle.sh

This will checkout fresh Ceres snapshot of Windows branch (which is currently
most interesting from integration into Blender POV), apply all patches listed
in patches/series and copy needed files into Blender's working copy. This will
also re-generate CMake/SCons build rules.

If you'll need extra files from Ceres repository which are not present in
Blender, you'll need to copy them manually and then run ./mkfiles.sh from
extern/libmv/third_party/ceres folder which will update list of files used
by Blender.

Thanks to Leir Mierle and Sameer Agarwal (and all others who helped developing
Ceres) this library and thanks to Keir Mierle with help integrating it into Blender!

7 years agoSupport for per-track Grease Pencil datablocks for motion tracking
Sergey Sharybin [Sun, 10 Jun 2012 15:26:50 +0000 (15:26 +0000)]
Support for per-track Grease Pencil datablocks for motion tracking

Originally was needed to reach easy way of defining masks used for tracking
(do eliminate textures which doesn't belong to feature when tracking.

Implemented as alternative to GP datablock for clip and added switch between
per-clip and per-track GP datablocks -- internal limitations of GP doesn't
allow to display all GP datablocks easily.  So either you see.edit GP associated
with clip or with track.

GP strokes associated with track are relative to track's position, following
tracks during tracking and could be shared between several tracks.

Masking code presents in libmv and there's rasterizer of GP datablocks for
masks in blender's tracking module, but they still need to be glued together.

Some documentation cound be found at this page:

http://wiki.blender.org/index.php/Dev:Ref/Release_Notes/2.64/Motion_Tracker#Grease_Pencil

7 years agostyle cleanup: use capital camel case names for typedef's
Campbell Barton [Sun, 10 Jun 2012 15:20:10 +0000 (15:20 +0000)]
style cleanup: use capital camel case names for typedef's

7 years agoFix #31778. BKE_image_user_frame_calc can be called with iuser==NULL in some circumst...
Lukas Toenne [Sun, 10 Jun 2012 15:07:08 +0000 (15:07 +0000)]
Fix #31778. BKE_image_user_frame_calc can be called with iuser==NULL in some circumstances now, so needs to check that.

7 years agochange RNA_struct_find_function to accept a type rather then a PointerRNA, add a...
Campbell Barton [Sun, 10 Jun 2012 13:34:59 +0000 (13:34 +0000)]
change RNA_struct_find_function to accept a type rather then a PointerRNA, add a check duplicate functions are not defined.

7 years agomango request - add alpha to histogram & sample line.
Campbell Barton [Sun, 10 Jun 2012 12:33:27 +0000 (12:33 +0000)]
mango request - add alpha to histogram & sample line.

7 years agoSynchronize changes with tomato branch
Sergey Sharybin [Sun, 10 Jun 2012 12:30:47 +0000 (12:30 +0000)]
Synchronize changes with tomato branch

7 years agoApplied and completed a compositor patch by Brecht to use signalling and waiting...
Lukas Toenne [Sun, 10 Jun 2012 12:26:33 +0000 (12:26 +0000)]
Applied and completed a compositor patch by Brecht to use signalling and waiting in scheduling and worker threads instead of continuous loops with sleep times. This should help reduce unnecessary wait times in Tile.

7 years agomango request
Campbell Barton [Sun, 10 Jun 2012 12:09:25 +0000 (12:09 +0000)]
mango request
- optionally display the histogram as lines (not filled areas).
- expand the enum for faster access.
- keep the sample line displayed after doing the line sample (running again clears).

7 years agocode cleanup: rename flag --> dflag (draw flag), since this is overly generic name...
Campbell Barton [Sun, 10 Jun 2012 10:15:49 +0000 (10:15 +0000)]
code cleanup: rename flag --> dflag (draw flag), since this is overly generic name and was passed about to many functions.

7 years agoFix for Tile group nodes with internally unconnected outputs, this was crashing due...
Lukas Toenne [Sun, 10 Jun 2012 09:30:31 +0000 (09:30 +0000)]
Fix for Tile group nodes with internally unconnected outputs, this was crashing due to missing constant value operations for such outputs. The SocketProxyNode now checks connection of the input socket on conversion, so this also simplifies usage of proxy nodes quite a bit.

7 years agofix for un-initialized memory use for modal inset/bevel.
Campbell Barton [Sun, 10 Jun 2012 09:05:49 +0000 (09:05 +0000)]
fix for un-initialized memory use for modal inset/bevel.

7 years agoMissed NULL-pointer checks in poll some functions
Sergey Sharybin [Sun, 10 Jun 2012 09:04:49 +0000 (09:04 +0000)]
Missed NULL-pointer checks in poll some functions

7 years agoFix for compositor image node draw function. The image user pointer needs to be const...
Lukas Toenne [Sun, 10 Jun 2012 07:51:57 +0000 (07:51 +0000)]
Fix for compositor image node draw function. The image user pointer needs to be constructed explicitly from the node storage pointer.

7 years agoFix #31747, broken image sequence loading after r47432.
Lukas Toenne [Sun, 10 Jun 2012 07:35:45 +0000 (07:35 +0000)]
Fix #31747, broken image sequence loading after r47432.

The image file name function was updating the iuser->framenr using a supposed cfra parameter. However, the actual cfra is unknown when loading movies or sequences, so the iuser->framenr value itself was passed in its place, leading to incremental addition of the iuser frame offset. Removed the cfra parameter altogether from the image path function. This should instead be done separately if necessary, it's not an inherent part of constructing the image file name.

7 years agoremove duplicate import
Campbell Barton [Sun, 10 Jun 2012 00:22:18 +0000 (00:22 +0000)]
remove duplicate import

7 years agoOBJECT_OT_drop_named_material -- missing notifier for material panel UI update
Dan Eicher [Sat, 9 Jun 2012 21:43:22 +0000 (21:43 +0000)]
OBJECT_OT_drop_named_material -- missing notifier for material panel UI update

7 years agocode cleanup: reduce float/double promotion
Campbell Barton [Sat, 9 Jun 2012 19:57:14 +0000 (19:57 +0000)]
code cleanup: reduce float/double promotion

7 years agostyle cleanup: assignment & indentation.
Campbell Barton [Sat, 9 Jun 2012 18:56:12 +0000 (18:56 +0000)]
style cleanup: assignment & indentation.

7 years agocode cleanup: removed/renamed shadow & duplicate variable definitions.
Campbell Barton [Sat, 9 Jun 2012 18:20:40 +0000 (18:20 +0000)]
code cleanup: removed/renamed shadow & duplicate variable definitions.

7 years agocode cleanup: quiet all warnings about double promotion (either by changing the type...
Campbell Barton [Sat, 9 Jun 2012 17:45:22 +0000 (17:45 +0000)]
code cleanup: quiet all warnings about double promotion (either by changing the type or explicitly casting).

7 years agostyle cleanup: block comments
Campbell Barton [Sat, 9 Jun 2012 17:22:52 +0000 (17:22 +0000)]
style cleanup: block comments

7 years agofix for un-handled exception when entering in multiple values to a button, floats...
Campbell Barton [Sat, 9 Jun 2012 16:45:42 +0000 (16:45 +0000)]
fix for un-handled exception when entering in multiple values to a button, floats were not correctly checked for.

7 years agocode cleanup: doxy comment filename corrections
Campbell Barton [Fri, 8 Jun 2012 23:43:11 +0000 (23:43 +0000)]
code cleanup: doxy comment filename corrections

7 years agoadd a utility function to get an exact match for a grease pencil frame.
Campbell Barton [Fri, 8 Jun 2012 22:07:57 +0000 (22:07 +0000)]
add a utility function to get an exact match for a grease pencil frame.

7 years agorna_SequenceElements_pop --> use memcpy instead of strcpy
Dan Eicher [Fri, 8 Jun 2012 22:05:26 +0000 (22:05 +0000)]
rna_SequenceElements_pop --> use memcpy instead of strcpy

7 years agocode cleanup: name mask and grease pencil dope sheet editor functions more consistantly
Campbell Barton [Fri, 8 Jun 2012 21:48:04 +0000 (21:48 +0000)]
code cleanup: name mask and grease pencil dope sheet editor functions more consistantly

7 years agoconstraints names are not matching (rna and constraint.c). doing rna->constraint.c
Dalai Felinto [Fri, 8 Jun 2012 21:04:48 +0000 (21:04 +0000)]
constraints names are not matching (rna and constraint.c). doing rna->constraint.c

7 years agoCycles / Cleanup:
Thomas Dinges [Fri, 8 Jun 2012 20:17:02 +0000 (20:17 +0000)]
Cycles / Cleanup:
* All references to old textures should now be finally removed.

7 years agoFixing a BGE bug where textures could get loaded into VRAM twice.
Mitchell Stokes [Fri, 8 Jun 2012 19:57:28 +0000 (19:57 +0000)]
Fixing a BGE bug where textures could get loaded into VRAM twice.

7 years agoCycles / Textures:
Thomas Dinges [Fri, 8 Jun 2012 19:57:25 +0000 (19:57 +0000)]
Cycles / Textures:
* Some code cleanup, removed old enums, which are not used anymore.
* Some renaming for consistency and to match new texture names.

7 years agoCycles / Code Cleanup:
Thomas Dinges [Fri, 8 Jun 2012 19:21:12 +0000 (19:21 +0000)]
Cycles / Code Cleanup:
* Removed a workaround for the NodeType enum, uses consecutive values now.

I could not find issues with CUDA, when compiling with Toolkit 4.2 (all sm kernels) and regression files rendered fine on my GPU with sm_21.

7 years agoFixed issue with missed reconstruction error in clip editor header
Sergey Sharybin [Fri, 8 Jun 2012 18:16:20 +0000 (18:16 +0000)]
Fixed issue with missed reconstruction error in clip editor header

Actually was causes by error in RNA bindings which lead to empty reconstruction
returned for cameraObject.reconstruction.

7 years agoFixed issue with non-updating frame in clip editor when toggling undistorted render...
Sergey Sharybin [Fri, 8 Jun 2012 17:16:32 +0000 (17:16 +0000)]
Fixed issue with non-updating frame in clip editor when toggling undistorted render while frame is grayscaled.

Also corrected some typos in movieclip.

7 years agoAdded a default case in switch to avoid paranoid compiler warnings.
Lukas Toenne [Fri, 8 Jun 2012 17:02:02 +0000 (17:02 +0000)]
Added a default case in switch to avoid paranoid compiler warnings.

7 years agoSelecting track channel in tracking dopesheet would make track active,
Sergey Sharybin [Fri, 8 Jun 2012 16:51:38 +0000 (16:51 +0000)]
Selecting track channel in tracking dopesheet would make track active,
just as it happens with curve view.

7 years agoAdded sorting by average reprojection error to motion tracking dopesheet.
Sergey Sharybin [Fri, 8 Jun 2012 16:42:24 +0000 (16:42 +0000)]
Added sorting by average reprojection error to motion tracking dopesheet.

7 years agoParticle Info node for Cycles. This can be used to access particle information in...
Lukas Toenne [Fri, 8 Jun 2012 16:17:57 +0000 (16:17 +0000)]
Particle Info node for Cycles. This can be used to access particle information in material shaders for dupli objects. For now only the particle Age and individual Lifetime (in frames) are supported, more attributes can be added when needed.

The particle data is stored in a separate texture if any of the dupli objects uses particle info nodes in shaders. To map dupli objects onto particles the store an additional particle_index value, which is different from the simple dupli object index (only visible particles, also works for particle dupli groups mode).

Some simple use cases on the code.blender.org blog:
http://code.blender.org/index.php/2012/05/particle-info-node/

7 years agoUpdate Bullet to version 2.80 (bullet svn revision 2537)
Sergej Reich [Fri, 8 Jun 2012 16:13:01 +0000 (16:13 +0000)]
Update Bullet to version 2.80 (bullet svn revision 2537)

Remove Jamfiles and other unused files that stuck around during previous updates.

Add patches for local changes to the patches directory.

Update readme.txt, it had outdated infromation.

7 years agoDon't show physics properties in game engine conext
Sergej Reich [Fri, 8 Jun 2012 15:24:28 +0000 (15:24 +0000)]
Don't show physics properties in game engine conext

Also rename fluid panels to be more consistent with other simulations

7 years agoFix #31752: Select All By Layer seems not to work when object belongs to several...
Sergey Sharybin [Fri, 8 Jun 2012 15:14:45 +0000 (15:14 +0000)]
Fix #31752: Select All By Layer seems not to work when object belongs to several layers

Added option which changes match policy from exact match and shared layers when
selecting objects by layer.

7 years agoadd listener in action space for mask changes so dopesheet redraws + other minor...
Campbell Barton [Fri, 8 Jun 2012 14:46:17 +0000 (14:46 +0000)]
add listener in action space for mask changes so dopesheet redraws + other minor changes.

7 years agomask animation keys now editable in the dope sheet (duplicate, transform, delete...
Campbell Barton [Fri, 8 Jun 2012 14:31:38 +0000 (14:31 +0000)]
mask animation keys now editable in the dope sheet (duplicate, transform, delete, select- etc).

7 years agoIndex: source/blender/gpu/intern/gpu_draw.c
Antony Riakiotakis [Fri, 8 Jun 2012 13:06:06 +0000 (13:06 +0000)]
Index: source/blender/gpu/intern/gpu_draw.c
===================================================================
--- source/blender/gpu/intern/gpu_draw.c (revision 47568)
+++ source/blender/gpu/intern/gpu_draw.c (working copy)
@@ -230,11 +230,12 @@
  Image *ima, *curima;

  int domipmap, linearmipmap;
+ int texpaint; /* store this so that new images created while texture painting won't be set to mipmapped */

  int alphablend;
  float anisotropic;
  MTFace *lasttface;
-} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, -1, 1.f, NULL};
+} GTS = {0, 0, 0, 0, 0, 0, 0, 0, NULL, NULL, 1, 0, 0, -1, 1.f, NULL};

 /* Mipmap settings */

@@ -256,7 +257,7 @@

 static int gpu_get_mipmap(void)
 {
- return GTS.domipmap;
+ return GTS.domipmap && !GTS.texpaint;
 }

 static GLenum gpu_get_mipmap_filter(int mag)
@@ -730,6 +731,8 @@
  if (!GTS.domipmap)
  return;

+ GTS.texpaint = !mipmap;
+
  if (mipmap) {
  for (ima=G.main->image.first; ima; ima=ima->id.next) {
  if (ima->bindcode) {

7 years agofix for bug in point slide using freed memory when auto-keying.
Campbell Barton [Fri, 8 Jun 2012 09:57:23 +0000 (09:57 +0000)]
fix for bug in point slide using freed memory when auto-keying.

7 years agosupport for subframe animation evaluation for masks.
Campbell Barton [Fri, 8 Jun 2012 09:35:51 +0000 (09:35 +0000)]
support for subframe animation evaluation for masks.

7 years agofix for own bug - evaluating past the last frame of a mask didnt work at all.
Campbell Barton [Fri, 8 Jun 2012 09:27:40 +0000 (09:27 +0000)]
fix for own bug - evaluating past the last frame of a mask didnt  work at all.

7 years ago * Added OpenCL kernel for bokeh blur
Jeroen Bakker [Fri, 8 Jun 2012 09:17:07 +0000 (09:17 +0000)]
 * Added OpenCL kernel for bokeh blur
 * Uncomment COM_OPENCL_ENABLED from COM_defines.h to test

7 years agoAnother fix for #31743: check for DM's verts number matches passed number of vertices
Sergey Sharybin [Fri, 8 Jun 2012 09:15:45 +0000 (09:15 +0000)]
Another fix for #31743: check for DM's verts number matches passed number of vertices

Now bevelled splines shall work in the same way as meshes.

7 years agoFix #31748: Blender crashes when typing "al" after opening spacebar menu.
Sergey Sharybin [Fri, 8 Jun 2012 08:24:08 +0000 (08:24 +0000)]
Fix #31748: Blender crashes when typing "al" after opening spacebar menu.

Crash was introduced by own refactoring of poll functions in clip editor.

7 years agoFix #31743: Applying Smooth modifier to a curve crashes Blender
Sergey Sharybin [Fri, 8 Jun 2012 08:17:34 +0000 (08:17 +0000)]
Fix #31743: Applying Smooth modifier to a curve crashes Blender

Actually there were two different issues involved here:

- Recently enabled Smooth modifier wasn't actually designed for curves, so
  it in fact requires a bit bigger work to make it working.

  For now added check for object's typy in this modifier and if it's not
  mesh, it wouldn't try to use edges.

  The reason why it worked in 3d viewport is that creating DM from curve while
  displist is still ocntrcuting for would result in empty CDDM and that leads to
  not taking edges into account, only vertexCos passed to modifier would be used.

  This makes it behaving a bit differently from if it was a mesh, but still gives
  quite reasonable result. Would leave actual fix for a guy who enabled smooth
  modifier.

- Another issue is related on ensuring sculpt mask layer after applying modifier.
  This shall happen only for meshes.

7 years agoClip editor: cleanup up header
Sergey Sharybin [Fri, 8 Jun 2012 07:55:15 +0000 (07:55 +0000)]
Clip editor: cleanup up header

One side of change is related on making code easier to follow, due it started
being quite messy because of all in-lined mode/view checks. Now there's a bit
of code duplication, but it's much easier to see what's going on there.

Another side of patch is related on re-arranging elements in header in a way
that follows rule "depending elements are placed after elements they depends on".
This might be a bit against mostly-used-based elements placement, but now it's
much easier to figure out where to add new option. Also it fits better other
blender's areas such as image editor header, i.e.

7 years agoMask editing: remove use_parent property and use check if paren't id is set instead
Sergey Sharybin [Fri, 8 Jun 2012 07:54:46 +0000 (07:54 +0000)]
Mask editing: remove use_parent property and use check if paren't id is set instead

7 years agonumber enums
Campbell Barton [Fri, 8 Jun 2012 06:11:24 +0000 (06:11 +0000)]
number enums

7 years agocode cleanup: assign values to enums in DNA
Campbell Barton [Fri, 8 Jun 2012 06:04:29 +0000 (06:04 +0000)]
code cleanup: assign values to enums in DNA

7 years agotypo/style edits
Campbell Barton [Fri, 8 Jun 2012 05:53:30 +0000 (05:53 +0000)]
typo/style edits

7 years ago- remove redundant NULL checks from mallocn's local linked list functions.
Campbell Barton [Fri, 8 Jun 2012 05:46:00 +0000 (05:46 +0000)]
- remove redundant NULL checks from mallocn's local linked list functions.
- minor changes to warning cleanup.

7 years agoinitial support for editing masks in the sequencer, currently only draw the mask.
Campbell Barton [Thu, 7 Jun 2012 19:24:49 +0000 (19:24 +0000)]
initial support for editing masks in the sequencer, currently only draw the mask.

7 years agoremove casts to short when allocating new imbufs.
Campbell Barton [Thu, 7 Jun 2012 18:33:36 +0000 (18:33 +0000)]
remove casts to short when allocating new imbufs.

7 years agonew sequence strip type for masks.
Campbell Barton [Thu, 7 Jun 2012 18:24:36 +0000 (18:24 +0000)]
new sequence strip type for masks.

7 years agoQuite some warnings...
Bastien Montagne [Thu, 7 Jun 2012 18:21:07 +0000 (18:21 +0000)]
Quite some warnings...

7 years agoTooltips shouldn't have dot at the end of sentence
Sergey Sharybin [Thu, 7 Jun 2012 18:10:25 +0000 (18:10 +0000)]
Tooltips shouldn't have dot at the end of sentence

7 years agoRemove unused ibuf argument from draw_gpencil_2dimage
Sergey Sharybin [Thu, 7 Jun 2012 17:57:49 +0000 (17:57 +0000)]
Remove unused ibuf argument from draw_gpencil_2dimage

It was used by sequencer only and it wasn't ported for a while already.
This change allows to save cahce lookup for image and clip editors.

7 years ago[#31739] Collada: New Export selections 'Include Armatures'
Gaia Clary [Thu, 7 Jun 2012 17:55:26 +0000 (17:55 +0000)]
[#31739] Collada: New Export selections 'Include Armatures'

7 years agoRemove checks for valid frame from poll function in clip editor space
Sergey Sharybin [Thu, 7 Jun 2012 16:36:19 +0000 (16:36 +0000)]
Remove checks for valid frame from poll function in clip editor space

This results in some buttons not disabled when there's no currently displaying frame,
but this saves lots of cache lookups and threading loks for every frame update.

7 years agoAvoid imbuf loading when getting movie clip size
Sergey Sharybin [Thu, 7 Jun 2012 16:15:24 +0000 (16:15 +0000)]
Avoid imbuf loading when getting movie clip size

This prevents high memory usage by non-proxied frames when doing mask parenting.

Description from code:

  Originally was needed to support image sequences with different image dimensions,
  which might be useful for such things as reconstruction of unordered image sequence,
  or painting/rotoscoping of non-equal-sized images, but this ended up in unneeded
  cache lookups and even unwanted non-proxied files loading when doing mask parenting,
  so let's disable this for now and assume image sequence consists of images with equal sizes

7 years agocode cleanup: rename sequencer types to SEQ_TYPE_*** and use enums rather then defines.
Campbell Barton [Thu, 7 Jun 2012 15:49:02 +0000 (15:49 +0000)]
code cleanup: rename sequencer types to SEQ_TYPE_*** and use enums rather then defines.

7 years agoadding mask points now adds in the correct place relative to shape keys (updating...
Campbell Barton [Thu, 7 Jun 2012 15:33:32 +0000 (15:33 +0000)]
adding mask points now adds in the correct place relative to shape keys (updating other keys for the new points still needs work though)

7 years agofix for crash with recent color commits to draw-object, this case wasnt handled corre...
Campbell Barton [Thu, 7 Jun 2012 15:20:51 +0000 (15:20 +0000)]
fix for crash with recent color commits to draw-object, this case wasnt handled correctly before.

7 years agofix for crash with selecting camera bundles.
Campbell Barton [Thu, 7 Jun 2012 14:21:25 +0000 (14:21 +0000)]
fix for crash with selecting camera bundles.

7 years agoBugfix [#31723] Renderer (internal) ignores keyframes on 'Compositing' checkbox
Joshua Leung [Thu, 7 Jun 2012 10:55:53 +0000 (10:55 +0000)]
Bugfix [#31723] Renderer (internal) ignores keyframes on 'Compositing' checkbox
for animations

Pipeline options such as Use Compositing and Use Sequencer cannot be animated
due to the way that they are implemented now, so adding these to the list of
render properties that we cannot animate.

7 years agoFix #31725: UV map order is ignored when opening in 2.6+ versions
Sergey Sharybin [Thu, 7 Jun 2012 09:11:16 +0000 (09:11 +0000)]
Fix #31725: UV map order is ignored when opening in 2.6+ versions

Issue was caused by do_versions being used pdata as reference for active/render/
stencil/clone layer indices instead of fdata.

Added some utility functions used only by do_versions to be sure this indices
are set from fdata for pre-bmesh files.

7 years agofix for buffer overrun on windows by kjym3 on IRC.
Campbell Barton [Thu, 7 Jun 2012 09:05:51 +0000 (09:05 +0000)]
fix for buffer overrun on windows by kjym3 on IRC.

7 years agofix for armature specular material color overriding the wire color when instanced...
Campbell Barton [Thu, 7 Jun 2012 09:04:45 +0000 (09:04 +0000)]
fix for armature specular material color overriding the wire color when instanced in a dupli

7 years agodont draw bone names/axis inside duplicators
Campbell Barton [Thu, 7 Jun 2012 08:20:10 +0000 (08:20 +0000)]
dont draw bone names/axis inside duplicators