blender.git
8 years agoMerging r42442 through r42457 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 6 Dec 2011 09:27:18 +0000 (09:27 +0000)]
Merging r42442 through r42457 from trunk into soc-2011-tomato

8 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

8 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.

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

8 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.

8 years agoObject tracking: fix setting axis in cases when object is scaled
Sergey Sharybin [Mon, 5 Dec 2011 20:07:13 +0000 (20:07 +0000)]
Object tracking: fix setting axis in cases when object is scaled

8 years agoCycles:
Brecht Van Lommel [Mon, 5 Dec 2011 19:54:59 +0000 (19:54 +0000)]
Cycles:
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.

8 years agoObject solver: minor tweaks
Sergey Sharybin [Mon, 5 Dec 2011 19:31:21 +0000 (19:31 +0000)]
Object solver: minor tweaks

- Rename solving button to Object Motion if active tracking object isn't a camera
- Ignore refine flags when solving object

8 years agoObject tracking; initial commit
Sergey Sharybin [Mon, 5 Dec 2011 18:57:17 +0000 (18:57 +0000)]
Object tracking; initial commit

This commit implements basis stuff needed for object tracking,
use case isn't perfect now, interface also should be cleaned a bit.

- Added list of objects to be tracked. Default there's only one object called
  "Camera" which is used for solving camera motion. Other objects can be added
  and each of them will have it;s own list of tracks. Only one object can be used
  for camera solving at this moment.
- Added new constraint called "Object Tracking" which makes oriented object be
  moving in the save way as solved object motion.
- Scene orientation tools can be used for orienting object to bundles.
- All tools which works with list of tracks or reconstruction data now
  gets that lists from active editing object.
- All objects and their tracking data are available via python api.

8 years agoMerging r42413 through r42441 form trunk into soc-2011-tomato
Sergey Sharybin [Mon, 5 Dec 2011 18:53:09 +0000 (18:53 +0000)]
Merging r42413 through r42441 form trunk into soc-2011-tomato

8 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.

8 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.

8 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!

8 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.

8 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.

8 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.

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

8 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.

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

8 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.

8 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)

8 years agoOptimization of preview widget scaling.
Sergey Sharybin [Sun, 4 Dec 2011 18:39:47 +0000 (18:39 +0000)]
Optimization of preview widget scaling.

Thanks to Campbell for pointing into issues.

8 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).

8 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.

8 years agoMerging r42394 through r42412 form trunk into soc-2011-tomato
Sergey Sharybin [Sun, 4 Dec 2011 17:26:35 +0000 (17:26 +0000)]
Merging r42394 through r42412 form trunk into soc-2011-tomato

8 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.

8 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

8 years agoFixed dark edges on preview widget sides: it was interpolating beyond the image bounds
Sergey Sharybin [Sun, 4 Dec 2011 17:12:10 +0000 (17:12 +0000)]
Fixed dark edges on preview widget sides: it was interpolating beyond the image bounds

8 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.

8 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,

8 years agoUse own bilinear interpolation function for preview widget sampling
Sergey Sharybin [Sun, 4 Dec 2011 16:07:50 +0000 (16:07 +0000)]
Use own bilinear interpolation function for preview widget sampling

Solves issue with image clamping, but issue with dark edge is still present

8 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.

8 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.

8 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__

8 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.

8 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

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

8 years agoAdd minimum correlation widget to tracker default settings panel.
Keir Mierle [Sun, 4 Dec 2011 14:08:58 +0000 (14:08 +0000)]
Add minimum correlation widget to tracker default settings panel.

8 years agoRemove an unused parameter from tracking.c
Keir Mierle [Sun, 4 Dec 2011 14:08:21 +0000 (14:08 +0000)]
Remove an unused parameter from tracking.c

8 years agoTurn grayscale preview on if any channel toggles are active for motion tracking.
Keir Mierle [Sun, 4 Dec 2011 13:58:40 +0000 (13:58 +0000)]
Turn grayscale preview on if any channel toggles are active for motion tracking.

8 years agoAdd support for detecting tracking failure in the ESM tracker component of
Keir Mierle [Sun, 4 Dec 2011 13:46:25 +0000 (13:46 +0000)]
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).

8 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

8 years agoAdd a toggle button to display motion tracker previews in grayscale.
Keir Mierle [Sun, 4 Dec 2011 12:58:31 +0000 (12:58 +0000)]
Add a toggle button to display motion tracker previews in grayscale.

8 years agoMerging r42350 through r42393 from trunk into soc-2011-tomato
Sergey Sharybin [Sun, 4 Dec 2011 12:32:26 +0000 (12:32 +0000)]
Merging r42350 through r42393 from trunk into soc-2011-tomato

8 years agoRevert "Fix a segfault in the tracker caused by attempting a one-frame track after...
Sergey Sharybin [Sun, 4 Dec 2011 12:06:01 +0000 (12:06 +0000)]
Revert "Fix a segfault in the tracker caused by attempting a one-frame track after the active tracker has become disabled."

BKE_tracking_next shouldn't be called if there's nothing to track.
Fixed in trunk, would be fixed here after upcoming merge.

8 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

8 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

8 years agoCUDA
Thomas Dinges [Sun, 4 Dec 2011 10:45:25 +0000 (10:45 +0000)]
CUDA
* 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.

8 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

8 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.

8 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.

8 years agoMake the tracker preview in the motion tracking panel show exactly what the
Keir Mierle [Sun, 4 Dec 2011 06:02:09 +0000 (06:02 +0000)]
Make the tracker preview in the motion tracking panel show exactly what the
tracking algorithm will see when any of the R/G/B channels are disabled, rather
than the RGB view that was there previously.

8 years agoFix a segfault in the tracker caused by attempting a one-frame track after the active...
Keir Mierle [Sun, 4 Dec 2011 04:51:30 +0000 (04:51 +0000)]
Fix a segfault in the tracker caused by attempting a one-frame track after the active tracker has become disabled.

8 years agoSwitch the tracker preview area to use bilinear filtering instead of nearest
Keir Mierle [Sun, 4 Dec 2011 04:33:06 +0000 (04:33 +0000)]
Switch the tracker preview area to use bilinear filtering instead of nearest
neighbour. This makes it easier to align tracks.

8 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.

8 years agoDon't show the "Correlation" tracking preset when the hybrid tracker is selected.
Keir Mierle [Sat, 3 Dec 2011 23:33:07 +0000 (23:33 +0000)]
Don't show the "Correlation" tracking preset when the hybrid tracker is selected.

8 years agoAdd a fix for compiling the brute force region tracker from libmv on Mac OS X.
Keir Mierle [Sat, 3 Dec 2011 23:30:11 +0000 (23:30 +0000)]
Add a fix for compiling the brute force region tracker from libmv on Mac OS X.

8 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.

8 years agoAdd a new hybrid region tracker for motion tracking to libmv, and
Keir Mierle [Sat, 3 Dec 2011 22:27:32 +0000 (22:27 +0000)]
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.

8 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.

8 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.

8 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)

8 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.

8 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.

8 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().

8 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 bpy.data.objects

8 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

8 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(...)

8 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.

8 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.

8 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)

8 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.

8 years agoMerging r42193 through r42349 from trunk into soc-2011-tomato
Sergey Sharybin [Fri, 2 Dec 2011 19:40:20 +0000 (19:40 +0000)]
Merging r42193 through r42349 from trunk into soc-2011-tomato

8 years agoPossible fix for #29436: issue with external numpad, that is generating unknown
Brecht Van Lommel [Fri, 2 Dec 2011 19:29:42 +0000 (19:29 +0000)]
Possible fix for #29436: issue with external numpad, that is generating unknown
key events. Disable using these as "key modifier".

8 years agoFix #28539: redraw issue with grease pencil active layer button, this was a regular
Brecht Van Lommel [Fri, 2 Dec 2011 19:08:40 +0000 (19:08 +0000)]
Fix #28539: redraw issue with grease pencil active layer button, this was a regular
button that acted like a toggle, now made it an actual toggle button.

8 years agoOSX: match quicktime and QTKit export to other formats/codecs
Jens Verwiebe [Fri, 2 Dec 2011 18:09:31 +0000 (18:09 +0000)]
OSX: match quicktime and QTKit export to other formats/codecs

8 years agoHSV Color Node for Cycles
Dalai Felinto [Fri, 2 Dec 2011 16:57:37 +0000 (16:57 +0000)]
HSV Color Node for Cycles
.........................
note, the OSL code has a problem.
In the original node the input and output nodes have the same name (Color).
So this will be fixed here once Brecht come up with a nice autorenaming (or we do a doversion patch) for that.

8 years agoFix #27626: nodes inside groups can't be muted. There was a check here to
Brecht Van Lommel [Fri, 2 Dec 2011 15:08:27 +0000 (15:08 +0000)]
Fix #27626: nodes inside groups can't be muted. There was a check here to
disable this, but with recent node muting patch and node group changes it
should work now.

8 years agoCycles:
Brecht Van Lommel [Fri, 2 Dec 2011 14:26:28 +0000 (14:26 +0000)]
Cycles:
* Fix broken compile of test app.
* Fix some warnings compiling with gcc for 32 bit.
* More tweaks to avoid extended precision issue from #29301.

8 years agoRename clip proxy rebuild function so it's no longer called in the same way
Sergey Sharybin [Fri, 2 Dec 2011 13:07:39 +0000 (13:07 +0000)]
Rename clip proxy rebuild function so it's no longer called in the same way
as proxy rebuild function in sequencer.

No functional changes.

8 years agocycles separateRGB: fix for cuda kernel building.
Dalai Felinto [Fri, 2 Dec 2011 07:13:48 +0000 (07:13 +0000)]
cycles separateRGB: fix for cuda kernel building.
Array indexing doesn't work there.

I'm yet to setup my CUDA computer, in the meantime this proved to work (tested by Daniel Salazar).
If I found other ways of doing it I get back to that.

8 years agomove editmesh derived mesh functions into their own file to match bmesh, without...
Campbell Barton [Fri, 2 Dec 2011 03:16:06 +0000 (03:16 +0000)]
move editmesh derived mesh functions into their own file to match bmesh, without this all merges in this area have to be done manually.

8 years agorenaming BooleanProperty to BoolProperty (rna structs shouldnt affect scripters)
Dalai Felinto [Thu, 1 Dec 2011 22:08:42 +0000 (22:08 +0000)]
renaming BooleanProperty to BoolProperty (rna structs shouldnt affect scripters)
Talked with Brecht and Campbell and they both agreed that bpy.types should match bpy.props
In the ideal world we would rename bpy.props to BooleanProperty. This would break scripts though. So we go for a compromise and at least have some consistency.

8 years agoSeparateRGB and CombineRGB nodes for Cycles materials
Dalai Felinto [Thu, 1 Dec 2011 21:46:10 +0000 (21:46 +0000)]
SeparateRGB and CombineRGB nodes for Cycles materials
reviewed and approved by Brecht

my first OpenCL code \o/

8 years agoCycles: fix glsl error when using light path node.
Brecht Van Lommel [Thu, 1 Dec 2011 19:31:36 +0000 (19:31 +0000)]
Cycles: fix glsl error when using light path node.

8 years agoCheck for mvert coords and normals when doing mesh.validate() and set invalid
Sergey Sharybin [Thu, 1 Dec 2011 19:21:58 +0000 (19:21 +0000)]
Check for mvert coords and normals when doing mesh.validate() and set invalid
coordinates to zero and zero-length normals to Z-up direction.

8 years agodynamic paint, possible use of uninitialized value - fix.
Campbell Barton [Thu, 1 Dec 2011 18:49:42 +0000 (18:49 +0000)]
dynamic paint, possible use of uninitialized value - fix.

8 years agoFix for RNA_warning crashing on MSVC release builds
Andrew Wiggin [Thu, 1 Dec 2011 18:38:03 +0000 (18:38 +0000)]
Fix for RNA_warning crashing on MSVC release builds

MSVC is not C99-compliant, but with the macro as it was, the "args" part was consuming and dropping one of the params, so the format string wanted N extra args, and there were only N-1... boom, crash! Without "args" this works correctly (checked on MSVC10 release build)

8 years agoFixed issue with multiple textures and editmode when VBOs are enabled
Sergey Sharybin [Thu, 1 Dec 2011 18:26:57 +0000 (18:26 +0000)]
Fixed issue with multiple textures and editmode when VBOs are enabled

8 years agoFixed crash caused by recent VBO's changes
Sergey Sharybin [Thu, 1 Dec 2011 18:26:48 +0000 (18:26 +0000)]
Fixed crash caused by recent VBO's changes

Crash was caused by non-initialized original index passing to compareDrawOptions
callback. Due to in some cases it's enough to know indices of faces in final DM
(like for comparing if the same texture used for mesh drawing) assume this
callback receives index in final DM and if it's needed it will make conversion
to original index itself.

This should help reaching extra speed if textured object is affected by
bevel modifiers, i.e.

8 years ago- remove redundant line in makesdna pointed out by 'troubled' in IRC
Campbell Barton [Thu, 1 Dec 2011 17:51:01 +0000 (17:51 +0000)]
- remove redundant line in makesdna pointed out by 'troubled' in IRC
- comment remove unused mesh edge flag.

8 years agoCycles
Brecht Van Lommel [Thu, 1 Dec 2011 16:33:21 +0000 (16:33 +0000)]
Cycles
* Compile all of cycles with -ffast-math again
* Add scons compilation of cuda binaries, tested on mac/linux.
* Add UI option for supported/experimental features, to make it
  more clear what is supported, opencl/subdivision is experimental.
* Remove cycles xml exporter, was just for testing.

8 years agoSlight refactor of VBO code to deal with multiple textures.
Sergey Sharybin [Thu, 1 Dec 2011 12:12:39 +0000 (12:12 +0000)]
Slight refactor of VBO code to deal with multiple textures.

Added compareDrawSettings callback to driver mesh's callbacks which are
drawing textured faces (mapped and not mapped). This new callback checks
if two faces are drawing with the same settings (testures, shading etc)
and if they not, flush of faces happens into ogl using glDrawArrays and
next face would be drawn with it's own settings.

Currently implemented compareDrawSettings is used to resolve issue from
bug report only, probably there are extra places where this callback is
needed, but haven't seen configuration where current logic will fail,
so it should be ok.

Also reordered arguments passing to drawMappedFaces DM's callbacks,
so now all drawing callback are accepting list of callbacks and then
userData, instead of using mixed order of callbacks and userData which
was a bit confusing to work with.

This commit fixes:
- #26410: VBO & multitexture doesnt work
- #29464: VBO enabled causes UV coruption

8 years agoFix #29469: Latest motion tracking not working.
Sergey Sharybin [Thu, 1 Dec 2011 10:25:16 +0000 (10:25 +0000)]
Fix #29469: Latest motion tracking not working.

It was error in CMakeLists.txt caused by automatic bundling script which
expanded variables instead of substituting them as-is.

Fixed both of bundling script and CMakeLists.txt

8 years agoAnother possible fix for #29301: issue with BVH intersection, reorder code a
Brecht Van Lommel [Wed, 30 Nov 2011 16:29:26 +0000 (16:29 +0000)]
Another possible fix for #29301: issue with BVH intersection, reorder code a
bit so that it's more symmetric and resulting float ops are compiled the same
way. Otherwise extended float precision being used in one place and not the
other can make comparisons fail.

8 years agoRemove MTEX_BUMP_FLIPPED flag which was added temporary when white/black colors
Sergey Sharybin [Wed, 30 Nov 2011 16:26:30 +0000 (16:26 +0000)]
Remove MTEX_BUMP_FLIPPED flag which was added temporary when white/black colors
for bump maps were toggled.

8 years agoUpdate space text's viewlines even if no text selected. It's needed for
Sergey Sharybin [Wed, 30 Nov 2011 15:10:44 +0000 (15:10 +0000)]
Update space text's viewlines even if no text selected. It's needed for
proper positioning to cursor when switching to text datablock in case
there was no datablock opened in text editor.

8 years agoForcing multires update when doing multires baking
Sergey Sharybin [Wed, 30 Nov 2011 11:04:57 +0000 (11:04 +0000)]
Forcing multires update when doing multires baking

Prevents issues with missed strokes baked into image when baking from sculpt mode.

8 years agodynamic paint
Campbell Barton [Wed, 30 Nov 2011 10:04:14 +0000 (10:04 +0000)]
dynamic paint
- replace inline code with existig defvert_find_index()
- use madd_v3_v3fl() func and remove redundant normalize call.

8 years agofix for parenting bug introduced by own commit r42273, adding dummy object didnt...
Campbell Barton [Wed, 30 Nov 2011 08:03:20 +0000 (08:03 +0000)]
fix for parenting bug introduced by own commit r42273, adding dummy object didnt initialize delta vectors.
also remove redundant NULL initializers, where the value is initialized immediately after.