9 years agosvn merge ^/trunk/blender -r42466:42495
Campbell Barton [Wed, 7 Dec 2011 18:29:21 +0000 (18:29 +0000)]
svn merge ^/trunk/blender -r42466:42495

9 years agoremove initilaizing weight collor with dummy value (from recent commit), harmless...
Campbell Barton [Wed, 7 Dec 2011 18:22:16 +0000 (18:22 +0000)]
remove initilaizing weight collor with dummy value (from recent commit), harmless but not needed.

9 years agoUpdate presets for tracking
Sergey Sharybin [Wed, 7 Dec 2011 17:28:42 +0000 (17:28 +0000)]
Update presets for tracking

9 years agoFix #28663: All "unit" properties show a value of 0 (on WinXP&MinGW&scons)
Sergey Sharybin [Wed, 7 Dec 2011 17:23:45 +0000 (17:23 +0000)]
Fix #28663: All "unit" properties show a value of 0 (on WinXP&MinGW&scons)

Use %g instead of %lg due to %g is supposed to be used for doubles and %lg confuses mingw at all

9 years agoMore fix for snapto in Pose mode:
Bastien Montagne [Wed, 7 Dec 2011 15:55:37 +0000 (15:55 +0000)]
More fix for snapto in Pose mode:
* The code for snap to grid was completely wrong (only x pos of chan was affected… by z computed value!), and the same problem as with snap to cursor was present (using armature_loc_pose_to_bone is wrong here). Also, computing nearest grid point in world space! Else, it generally ends up completely out of grid, due to object transforms...
* Small cleanup of code (uneeded vars and copying).

9 years agoFix [#29461] Selection-to-Cursor works strange with bones with TrackTo constraint.
Bastien Montagne [Wed, 7 Dec 2011 15:21:38 +0000 (15:21 +0000)]
Fix [#29461] Selection-to-Cursor works strange with bones with TrackTo constraint.

In fact, the problem was present with any kind of constraint…

We need the cursor coordinates in the rest bone space (aka armature space), i.e with all "manual" and "procedural" (constraints, ...) pose transforms cleared (as said in armature_mat_pose_to_bone:

/* Remove the pchan's transforms from it's pose_mat.
 * This should leave behind the effects of restpose +
 * parenting + constraints

, only "manual" transforms are "cleared" by armature_loc_pose_to_bone...).

9 years agoMerging remained part of hybrid tracker which adds correlation threshold
Sergey Sharybin [Wed, 7 Dec 2011 14:54:03 +0000 (14:54 +0000)]
Merging remained part of hybrid tracker which adds correlation threshold

Keir's comment:
  Add support for detecting tracking failure in the ESM tracker component of
  libmv. Since both KLT and Hybrid rely on ESM underneath, KLT and Hybrid now
  have a minimum correlation setting to match. With this fix, track failures
  should get detected quicker, with the issue that sometimes the tracker will
  give up too easily. That is fixable by reducing the required correlation (in
  the track properties).

Command used for merge: svn merge -r 42396:42397 -r 42399:42400 ^/branches/soc-2011-tomato

9 years agoFix #29523: RenderEngine.update_progress() doesn't redraw UI.
Brecht Van Lommel [Wed, 7 Dec 2011 11:29:24 +0000 (11:29 +0000)]
Fix #29523: RenderEngine.update_progress() doesn't redraw UI.

9 years agoFix #29518: uv cylinder/sphere unwrap from menu didn't work same as using U key menu.
Brecht Van Lommel [Wed, 7 Dec 2011 11:22:29 +0000 (11:22 +0000)]
Fix #29518: uv cylinder/sphere unwrap from menu didn't work same as using U key menu.

9 years agoTracks which were moved to close to boundary weren'haven't been disabled when doing
Sergey Sharybin [Wed, 7 Dec 2011 10:53:51 +0000 (10:53 +0000)]
Tracks which were moved to close to boundary weren'haven't been disabled when doing
frame-by-frame tracking.

9 years agoMake Hybrid tracker default for movie clips
Sergey Sharybin [Wed, 7 Dec 2011 10:01:39 +0000 (10:01 +0000)]
Make Hybrid tracker default for movie clips

9 years agoFix #29432: Marquee Select Bug
Sergey Sharybin [Wed, 7 Dec 2011 09:55:37 +0000 (09:55 +0000)]
Fix #29432: Marquee Select Bug

Moved tweak threshold value to user preferences

This threshold might be needed to be tweaked when working with tables, i.e.
to prevent tap+slight movement be treated as tweak event.

9 years agoCamera tracking: some bug fixes
Sergey Sharybin [Wed, 7 Dec 2011 09:21:50 +0000 (09:21 +0000)]
Camera tracking: some bug fixes

- Fixed bug with not putting disabled markers properly when doing backwards tracking
- Fixed margin size calculating from pattern size which used to be double-sized
  and prevented to track things on the image edges.

9 years agofix for NULL pointer free and add in some checks, while looking into bug [#29521],
Campbell Barton [Wed, 7 Dec 2011 09:13:15 +0000 (09:13 +0000)]
fix for NULL pointer free and add in some checks, while looking into bug [#29521],
add asserts so we know if an invalid active index is ever set.

9 years agocorrect missing argument error if CYCLES_OPTIMIZED_KERNEL_FLAGS isnt set
Campbell Barton [Wed, 7 Dec 2011 08:03:52 +0000 (08:03 +0000)]
correct missing argument error if CYCLES_OPTIMIZED_KERNEL_FLAGS isnt set

9 years agofix for uninitialized memory use drawing 'nan' vertex groups, noticed while looking...
Campbell Barton [Wed, 7 Dec 2011 07:13:33 +0000 (07:13 +0000)]
fix for uninitialized memory use drawing 'nan' vertex groups, noticed while looking into [#29521]

9 years agoremove BMEMSET define, use memset instead
Campbell Barton [Wed, 7 Dec 2011 04:27:40 +0000 (04:27 +0000)]
remove BMEMSET define, use memset instead

9 years agoalternative fix for [#29338], now dont duplicate the vertex layer when calculating...
Campbell Barton [Wed, 7 Dec 2011 01:12:53 +0000 (01:12 +0000)]
alternative fix for [#29338], now dont duplicate the vertex layer when calculating normals, instead only calculate face normals.

9 years agofix for noise module in driver namespace (was infact mathutils).
Campbell Barton [Wed, 7 Dec 2011 00:36:57 +0000 (00:36 +0000)]
fix for noise module in driver namespace (was infact mathutils).

9 years agoavoid looping through the polygons to find the maxium loop size by using BLI_array_de...
Campbell Barton [Wed, 7 Dec 2011 00:25:21 +0000 (00:25 +0000)]
avoid looping through the polygons to find the maxium loop size by using BLI_array_declare, tested on optimized build and its slighly faster though IMHO this is easier to follow.

9 years agooptimization for BLI_array_growitems (better put - improve inefficient method), BLI_a...
Campbell Barton [Wed, 7 Dec 2011 00:18:08 +0000 (00:18 +0000)]
optimization for BLI_array_growitems (better put - improve inefficient method), BLI_array_growone was being called in a loop, even if the size of the allocated array was big enough for all items.

In this case now just adjust the count value since theres no need to loop,
when the allocation is not big enough BLI_array_growone in a loop is still used though.

9 years agoadded mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip...
Campbell Barton [Tue, 6 Dec 2011 22:55:41 +0000 (22:55 +0000)]
added mesh_calc_normals_ex() which is mesh_calc_normals() with an option to skip recalculating the vertex normals (only calculate poly/face normals instead).

also removed unneeded allocation of face normals.

otherwise no functional change.

9 years agosvn merge ^/trunk/blender -r42439:42466
Campbell Barton [Tue, 6 Dec 2011 18:50:45 +0000 (18:50 +0000)]
svn merge ^/trunk/blender -r42439:42466

9 years agoFix related to #29513: materials using nodes will output passes from the active
Brecht Van Lommel [Tue, 6 Dec 2011 16:04:45 +0000 (16:04 +0000)]
Fix related to #29513: materials using nodes will output passes from the active
material node. This is a confusing system, but two features were missing from
2.4x that made this at least a bit more clear:

* The top right icon in the node now shows brighter again for the active node.
* Setting a material datablock in a node makes that node active.

9 years agoCycles / CUDA Kernel compile:
Thomas Dinges [Tue, 6 Dec 2011 16:00:57 +0000 (16:00 +0000)]
Cycles / CUDA Kernel compile:
* Added option "WITH_BF_CYCLES_CUDA_THREADED_COMPILE" for the people who have much RAM (8 or more) and can compile several kernels at the same time. If enabled, it uses the general BF_NUMJOBS flag.
* The option is off per default.

9 years agoFix #27622: Sequencer Wipe Angle Incorrect
Sergey Sharybin [Tue, 6 Dec 2011 15:32:10 +0000 (15:32 +0000)]
Fix #27622: Sequencer Wipe Angle Incorrect

Made wipe angle be real angle instead of making some ease effects which can be reached by animation curves.

9 years agoFix #29511: Separate tool duplicates objects
Sergey Sharybin [Tue, 6 Dec 2011 14:34:56 +0000 (14:34 +0000)]
Fix #29511: Separate tool duplicates objects

Do not register separate mesh operator so it can't be redone from operator redo panel.

9 years agoCycles: scons cuda kernel compile now does one kernel at a time, to reduce memory
Brecht Van Lommel [Tue, 6 Dec 2011 12:29:54 +0000 (12:29 +0000)]
Cycles: scons cuda kernel compile now does one kernel at a time, to reduce memory

9 years agoFixed crash when movie clip curves region is opened and clip is getting unlinked
Sergey Sharybin [Tue, 6 Dec 2011 12:04:39 +0000 (12:04 +0000)]
Fixed crash when movie clip curves region is opened and clip is getting unlinked

9 years agoQuiet annoying warning:
Campbell Barton [Tue, 6 Dec 2011 09:28:25 +0000 (09:28 +0000)]
Quiet annoying warning:

  Warning! Tesselation uvs or vcol data got out of sync, "had to reset!

This would happen on every editmode edit with UV's and wasn't too reassuring that blender was handling uvs/vcols correctly.

From looking into the problem I found that creating the undo mesh would act as if it was tessellating the existing mesh each time and complain that the data was out of sync, when infact the mesh was just created and being filled in.

Also, allocating uv and vcol customdata arrats for tessfaces isn't needed for undo mesh, so save some memory and dont allocate these in the first place.

9 years agoCamera tracking: fixed typo in remove tracking preset button
Sergey Sharybin [Tue, 6 Dec 2011 09:23:35 +0000 (09:23 +0000)]
Camera tracking: fixed typo in remove tracking preset button

9 years agoremove double lookus in BM_GetCDf/BM_SetCDf, also remove bm_cdata_get_single_float...
Campbell Barton [Tue, 6 Dec 2011 08:07:12 +0000 (08:07 +0000)]
remove double lookus in BM_GetCDf/BM_SetCDf, also remove bm_cdata_get_single_float which was a duplicate of BM_GetCDf.

9 years agoattempt to fix defione for qtcreator project file and cycles define.
Campbell Barton [Tue, 6 Dec 2011 04:53:16 +0000 (04:53 +0000)]
attempt to fix defione for qtcreator project file and cycles define.

9 years agofix for crash calling rotate edge on a completely selected torus.
Campbell Barton [Tue, 6 Dec 2011 03:31:28 +0000 (03:31 +0000)]
fix for crash calling rotate edge on a completely selected torus.

9 years agoyet another fix for [#28645] TODO: dissolve edges doesn't delete lonely vertices...
Campbell Barton [Tue, 6 Dec 2011 02:24:30 +0000 (02:24 +0000)]
yet another fix for [#28645] TODO: dissolve edges doesn't delete lonely vertices on edges

this one finally does what Vilem Novak was asking for, however the other changes were still improvements.

9 years agofix for crash toggling editmode with vertex parenting, add check if the vertex map...
Campbell Barton [Tue, 6 Dec 2011 01:49:35 +0000 (01:49 +0000)]
fix for crash toggling editmode with vertex parenting, add check if the vertex map can even be created to save looping over all mesh data to do nothing, which is what was happening previously when it (wasnt crashing) in some cases.

9 years agomore minor py edits
Campbell Barton [Mon, 5 Dec 2011 23:05:16 +0000 (23:05 +0000)]
more minor py edits

9 years agoremove invalid NULL checks from own recent commit and minor pep8 edits.
Campbell Barton [Mon, 5 Dec 2011 22:19:30 +0000 (22:19 +0000)]
remove invalid NULL checks from own recent commit and minor pep8 edits.

9 years agoCycles:
Brecht Van Lommel [Mon, 5 Dec 2011 19:54:59 +0000 (19:54 +0000)]
Fix #29475: remove node from properties editor crash on windows. This was a bug
in the UI code, which code access removed data.
Fix OpenCL still being used in a case where Experimental was disabled.
Fix msvc debug warning in md5 code.

9 years agosvn merge ^/trunk/blender -r42426:42439
Campbell Barton [Mon, 5 Dec 2011 17:54:33 +0000 (17:54 +0000)]
svn merge ^/trunk/blender -r42426:42439

9 years agoFix #28107: save screenshot operator option to save full screen or only a single
Brecht Van Lommel [Mon, 5 Dec 2011 16:37:31 +0000 (16:37 +0000)]
Fix #28107: save screenshot operator option to save full screen or only a single
editor was not working. Solution is to take full screenshot and crop it on save.
Also fixed screenshot showing popup menu used to execute operator.

9 years agoFix #29507: cycles rendering of metaball animations not working.
Brecht Van Lommel [Mon, 5 Dec 2011 15:57:57 +0000 (15:57 +0000)]
Fix #29507: cycles rendering of metaball animations not working.

9 years agoRelease Cycle:
Thomas Dinges [Mon, 5 Dec 2011 15:32:17 +0000 (15:32 +0000)]
Release Cycle:
* BCon4: Release candidate, important bug fixes only!

9 years agoFix #29506: libmv build issues on freebsd, patch by Shane Ambler.
Brecht Van Lommel [Mon, 5 Dec 2011 14:01:57 +0000 (14:01 +0000)]
Fix #29506: libmv build issues on freebsd, patch by Shane Ambler.

9 years agoFix: Dynamic Paint sub-steps didn't work for constraint controlled brush objects.
Miika Hamalainen [Mon, 5 Dec 2011 13:36:41 +0000 (13:36 +0000)]
Fix: Dynamic Paint sub-steps didn't work for constraint controlled brush objects.

9 years agofix for dscale which was set to 0,0,0 from files saved between Nov 29 and Dec 4.
Campbell Barton [Mon, 5 Dec 2011 11:02:54 +0000 (11:02 +0000)]
fix for dscale which was set to 0,0,0 from files saved between Nov 29 and Dec 4.

9 years agoMinor whitespace fixes
Sergey Sharybin [Mon, 5 Dec 2011 07:56:31 +0000 (07:56 +0000)]
Minor whitespace fixes

9 years agofix [#29378] some textures getting stretched when the mesh has solidify and subsurf
Campbell Barton [Mon, 5 Dec 2011 07:48:49 +0000 (07:48 +0000)]
fix [#29378] some textures getting stretched when the mesh has solidify and subsurf

9 years agocommenting out code added in bmesh and not verified.
Campbell Barton [Mon, 5 Dec 2011 05:28:31 +0000 (05:28 +0000)]
commenting out code added in bmesh and not verified.

9 years agomake use of axis_dominant_v3() function for is_quad_convex_v3()
Campbell Barton [Mon, 5 Dec 2011 02:57:30 +0000 (02:57 +0000)]
make use of axis_dominant_v3() function for is_quad_convex_v3()

9 years agofix [#29338] Viewport does not update when sculpting without a multires modifer
Campbell Barton [Mon, 5 Dec 2011 01:58:24 +0000 (01:58 +0000)]
fix [#29338] Viewport does not update when sculpting without a multires modifer

when no modifiers are applied, dont re-tessellate,

for future referece - this bug was caused because can_pbvh_draw() checks if (cddm->mvert == me->mvert)
re-tesselating the faces copies the vertex array so it was returning false.

9 years agosvn merge ^/trunk/blender -r42422:42426
Campbell Barton [Sun, 4 Dec 2011 23:39:01 +0000 (23:39 +0000)]
svn merge ^/trunk/blender -r42422:42426

9 years agomanual sync with trunk - pulling in changes where the issues are not bmesh spesific
Campbell Barton [Sun, 4 Dec 2011 23:13:28 +0000 (23:13 +0000)]
manual sync with trunk - pulling in changes where the issues are not bmesh spesific
- some merges added lines in multiple times
- removed some NULL checks that were only in bmesh
- enable cycles by default (was disabled because it used not to work)
- make formatting match

9 years agosyncing some minor formatting edits from bmesh branch.
Campbell Barton [Sun, 4 Dec 2011 23:04:43 +0000 (23:04 +0000)]
syncing some minor formatting edits from bmesh branch.

9 years ago(no commit message)
Daniel Salazar [Sun, 4 Dec 2011 22:48:23 +0000 (22:48 +0000)]

9 years agosvn merge ^/trunk/blender -r42416:42422
Campbell Barton [Sun, 4 Dec 2011 20:05:50 +0000 (20:05 +0000)]
svn merge ^/trunk/blender -r42416:42422

9 years agoremove mesh PartialVisibility, it wasnt being version patches or used anywhere, other...
Campbell Barton [Sun, 4 Dec 2011 19:49:35 +0000 (19:49 +0000)]
remove mesh PartialVisibility, it wasnt being version patches or used anywhere, other then save/load/free.

9 years agoSlight optimization of track preview widget (the same approach as in tomato branch)
Sergey Sharybin [Sun, 4 Dec 2011 18:49:41 +0000 (18:49 +0000)]
Slight optimization of track preview widget (the same approach as in tomato branch)

9 years agosvn merge ^/trunk/blender -r42372:42416
Campbell Barton [Sun, 4 Dec 2011 18:39:19 +0000 (18:39 +0000)]
svn merge ^/trunk/blender -r42372:42416

9 years agoA (hopefully last) bunch of fixes and tweaks to UI label and messages (found while...
Bastien Montagne [Sun, 4 Dec 2011 17:36:13 +0000 (17:36 +0000)]
A (hopefully last) bunch of fixes and tweaks to UI label and messages (found while translating in french).

9 years agoremove unused SpaceTime.redraws.
Campbell Barton [Sun, 4 Dec 2011 17:35:17 +0000 (17:35 +0000)]
remove unused SpaceTime.redraws.

now there are no more use of deprecated struct member warnings.

9 years ago`#if 0` use of Object.nlastrips, there is no way to add or remove these from blender...
Campbell Barton [Sun, 4 Dec 2011 17:24:34 +0000 (17:24 +0000)]
`#if 0` use of Object.nlastrips, there is no way to add or remove these from blender so better not run.

9 years agoFix for movie clips weren't remapped properly on file save
Sergey Sharybin [Sun, 4 Dec 2011 17:16:22 +0000 (17:16 +0000)]
Fix for movie clips weren't remapped properly on file save

9 years agoFix [#29502] Brush texture Preview panel doesnt show Alpha checkbox
Thomas Dinges [Sun, 4 Dec 2011 16:55:46 +0000 (16:55 +0000)]
Fix [#29502] Brush texture Preview panel doesnt show Alpha checkbox
* Added to the py UI file, it would require some deeper changes to have it in the c Template, can be done later.
* Fixed a typo.

9 years agoremove old renderer struct member, was only used for setting yafray but was still...
Campbell Barton [Sun, 4 Dec 2011 16:22:53 +0000 (16:22 +0000)]
remove old renderer struct member, was only used for setting yafray but was still being checked in a few places,

9 years agoFix compile issue on windows, broke this trying to fix for mac.
Brecht Van Lommel [Sun, 4 Dec 2011 15:49:14 +0000 (15:49 +0000)]
Fix compile issue on windows, broke this trying to fix for mac.

9 years agofix building on openbsd, also quiet some warnings.
Campbell Barton [Sun, 4 Dec 2011 15:45:53 +0000 (15:45 +0000)]
fix building on openbsd, also quiet some warnings.

9 years agoFix warning for redefinition of __MSVCRT_VERSION__
Antony Riakiotakis [Sun, 4 Dec 2011 14:47:21 +0000 (14:47 +0000)]
Fix warning for redefinition of __MSVCRT_VERSION__

9 years agoFix MinGW compilation:
Antony Riakiotakis [Sun, 4 Dec 2011 14:43:37 +0000 (14:43 +0000)]
Fix MinGW compilation:

define __MSVCRT_VERSION__ to 0x0700 (microsoft runtime msvcr70.dll) so _aligned_malloc is defined.

9 years agoSmall code cleanup of tracking.c
Sergey Sharybin [Sun, 4 Dec 2011 14:42:21 +0000 (14:42 +0000)]
Small code cleanup of tracking.c

9 years agoFix of pattern position clamping
Sergey Sharybin [Sun, 4 Dec 2011 14:42:10 +0000 (14:42 +0000)]
Fix of pattern position clamping

9 years agoCamera tracking: merge hybrid tracker from tomato branch
Sergey Sharybin [Sun, 4 Dec 2011 13:26:11 +0000 (13:26 +0000)]
Camera tracking: merge hybrid tracker from tomato branch

Comment from Keir's commit:

Add a new hybrid region tracker for motion tracking to libmv, and
add it as an option (under "Hybrid") in the tracking settings. The
region tracker is a combination of brute force tracking for coarse
alignment, then refinement with the ESM/KLT algorithm already in
libmv that gives excellent subpixel precision (typically 1/50'th
of a pixel)

This also adds a new "brute force" region tracker which does a
brute force search through every pixel position in the destination
for the pattern in the first frame. It leverages SSE if available,
similar to the SAD tracker, to do this quickly. Currently it does
some unnecessary conversions to/from floating point that will get
fixed later.

The hybrid tracker glues the two trackers (brute & ESM) together
to get an overall better tracker. The algorithm is simple:

1. Track from frame 1 to frame 2 with the brute force tracker.
   This tries every possible pixel position for the pattern from
   frame 1 in frame 2. The position with the smallest
   sum-of-absolute-differences is chosen. By definition, this
   position is only accurate up to 1 pixel or so.
2. Using the result from 1, initialize a track with ESM. This does
   a least-squares fit with subpixel precision.
3. If the ESM shift was more than 2 pixels, report failure.
4. If the ESM track shifted less than 2 pixels, then the track is
   good and we're done. The rationale here is that if the
   refinement stage shifts more than 1 pixel, then the brute force
   result likely found some random position that's not a good fit.

svn command used: svn merge -r 42375:42376 -r 42377:42379 ^/branches/soc-2011-tomato

9 years agoDo not clamp search size when adding new track with non-klt tracker set
Sergey Sharybin [Sun, 4 Dec 2011 11:57:23 +0000 (11:57 +0000)]
Do not clamp search size when adding new track with non-klt tracker set

9 years agoFix crash when trying to track disabled track.
Sergey Sharybin [Sun, 4 Dec 2011 10:57:36 +0000 (10:57 +0000)]
Fix crash when trying to track disabled track.

This is possible fixes #29498: Seg fault on trying to track byond clip length

9 years agoCUDA
Thomas Dinges [Sun, 4 Dec 2011 10:45:25 +0000 (10:45 +0000)]
* Added CUDA Binaries to Windows scons config files, disabled by default.
Also the path to nvcc is commented out, best to set this in the user config, as it varies on each system probably.

9 years agoinclude mathutils.noise in sphinx docs
Campbell Barton [Sun, 4 Dec 2011 06:55:32 +0000 (06:55 +0000)]
include mathutils.noise in sphinx docs

9 years agoremove use of deprecated struct members
Campbell Barton [Sun, 4 Dec 2011 06:39:35 +0000 (06:39 +0000)]
remove use of deprecated struct members
- editmesh smooth & subdivide were using old mirror axis flag still.
- removed colbits from outliner and object code.
- commented some other parts of the code which access deprecated members and aren't called anywhere.

9 years agoadd define for deprecated DNA struct members: DNA_DEPRECATED,
Campbell Barton [Sun, 4 Dec 2011 06:05:48 +0000 (06:05 +0000)]
add define for deprecated DNA struct members: DNA_DEPRECATED,
this means use of deprecated struct members gives a warning.

- makesdna.c preprocessor skips this.
- DNA_DEPRECATED_ALLOW is used so readfile.c can do versioning without warnings.
- this exposes some use of deprecated struct members, will deal with this after.

9 years agoadd a new object member to store the dsize, since with my recent commit broke forward...
Campbell Barton [Sun, 4 Dec 2011 03:35:54 +0000 (03:35 +0000)]
add a new object member to store the dsize, since with my recent commit broke forward compatibility. now the new values are copied into 'dscale' and existing ones remain.

this is annoying since now we have dsize and dscale, will look into a way to deprecate struct members next.

9 years agobmesh: fixed crash in bevel
Joseph Eagar [Sun, 4 Dec 2011 00:44:09 +0000 (00:44 +0000)]
bmesh: fixed crash in bevel

9 years agoInvert Color Cycles Node
Dalai Felinto [Sat, 3 Dec 2011 23:05:35 +0000 (23:05 +0000)]
Invert Color Cycles Node
as with the HSV node the OSL code is relying on the (yet to be implemented) autorename.

Also the svm code could use mix (svm_lerp) instead:
 32 . float3 color_inv = make_float3(1.0f, 1.0f, 1.0f) - color;
 35 . . stack_store_float3(stack, out_color, svm_lerp(color_inv, color, factor));

I have a feeling that each node 'program' should have the least program as possible. I'll see with Brecht later.
But overall I don't know if that's any fast. And apart from that I think we will need this kind of function to move to a library if multiple functions linked in are not a problem.

9 years agoflush selected vertices when switching from vertex weight paint mode to editmode...
Campbell Barton [Sat, 3 Dec 2011 22:15:13 +0000 (22:15 +0000)]
flush selected vertices when switching from vertex weight paint mode to editmode (as is done with faces).

note - a limitation with mode changing means this isnt used yet with toggling.

9 years agoFix cycles compile issue after last commit.
Brecht Van Lommel [Sat, 3 Dec 2011 21:27:19 +0000 (21:27 +0000)]
Fix cycles compile issue after last commit.

9 years agosvn merge ^/trunk/blender -r42361:42372
Campbell Barton [Sat, 3 Dec 2011 21:01:26 +0000 (21:01 +0000)]
svn merge ^/trunk/blender -r42361:42372

9 years agoshorten very long lines in drawobject.c, (no functional changes)
Campbell Barton [Sat, 3 Dec 2011 20:49:41 +0000 (20:49 +0000)]
shorten very long lines in drawobject.c, (no functional changes)

9 years agofix for weight paint mode drawing selected verts even when it wasnt the active object.
Campbell Barton [Sat, 3 Dec 2011 20:26:53 +0000 (20:26 +0000)]
fix for weight paint mode drawing selected verts even when it wasnt the active object.

9 years agoFix #29444: cycles problem building BVH with NaN vertices.
Brecht Van Lommel [Sat, 3 Dec 2011 20:22:21 +0000 (20:22 +0000)]
Fix #29444: cycles problem building BVH with NaN vertices.

9 years agoFix #29483: edge slide gives nan when zoomed in close. Cause was integer
Brecht Van Lommel [Sat, 3 Dec 2011 13:16:32 +0000 (13:16 +0000)]
Fix #29483: edge slide gives nan when zoomed in close. Cause was integer
overflow leading to negative value for sqrt().

9 years agoadd library support for rna collection __contains__, eg
Campbell Barton [Sat, 3 Dec 2011 06:10:32 +0000 (06:10 +0000)]
add library support for rna collection  __contains__, eg

  ("Cube", "//lib.blend") in

9 years agofix for derived mesh buffer overrun caused by using an incorrect loop length.
Campbell Barton [Sat, 3 Dec 2011 02:11:38 +0000 (02:11 +0000)]
fix for derived mesh buffer overrun caused by using an incorrect loop length.

editmode extruding would crash instantly when dupli-faces were enabled.

9 years agoEnables vc 2010 boost libraries for cmake
Alexander Kuznetsov [Sat, 3 Dec 2011 01:12:57 +0000 (01:12 +0000)]
Enables vc 2010 boost libraries for cmake

9 years agosvn merge ^/trunk/blender -r42333:42361
Campbell Barton [Fri, 2 Dec 2011 23:02:21 +0000 (23:02 +0000)]
svn merge ^/trunk/blender -r42333:42361

9 years agosome formatting edits & #if 0 files which are not used.
Campbell Barton [Fri, 2 Dec 2011 22:35:05 +0000 (22:35 +0000)]
some formatting edits & #if 0 files which are not used.

9 years agode-duplicate dominant axis calculation, exact same checks were in 6 different places.
Campbell Barton [Fri, 2 Dec 2011 22:14:20 +0000 (22:14 +0000)]
de-duplicate dominant axis calculation, exact same checks were in 6 different places.
added function:  axis_dominant_v3(...)

9 years agoFix #27620: improve mesh deform error message when it fails to bind.
Brecht Van Lommel [Fri, 2 Dec 2011 21:10:29 +0000 (21:10 +0000)]
Fix #27620: improve mesh deform error message when it fails to bind.

9 years agoFix #29477: make proxy gave proxy object the wrong name with OB prefix.
Brecht Van Lommel [Fri, 2 Dec 2011 20:49:31 +0000 (20:49 +0000)]
Fix #29477: make proxy gave proxy object the wrong name with OB prefix.

Broke in revision 41125 with BLI_snprintf refactoring, checked other
changes in that commit and they seem to be fine, was just this one.

9 years agofix for own error - r42200, broke knife tool edge/triangle intersection.
Campbell Barton [Fri, 2 Dec 2011 20:45:20 +0000 (20:45 +0000)]
fix for own error - r42200, broke knife tool edge/triangle intersection.

9 years agoCameraData Input Cycles Node
Dalai Felinto [Fri, 2 Dec 2011 20:36:13 +0000 (20:36 +0000)]
CameraData Input Cycles Node
reviewed and approved by Brecht

Important note:
the camera Z is reverted compared to Blender render.
Now it goes from zero (camera) to positive (in front of the camera)

9 years agoFix #29073: keyframing integer properties now uses linear interpolation
Brecht Van Lommel [Fri, 2 Dec 2011 19:49:09 +0000 (19:49 +0000)]
Fix #29073: keyframing integer properties now uses linear interpolation
by default, and enums use constant interpolation. Bezier doesn't make
much sense for these.

9 years agoHook up mesh select_all properties added in previous commit
Howard Trickey [Fri, 2 Dec 2011 19:43:53 +0000 (19:43 +0000)]
Hook up mesh select_all properties added in previous commit