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

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

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

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

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

7 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

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

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

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

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

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

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

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

7 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

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

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

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

7 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

7 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

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

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

7 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

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

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

7 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

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

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

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

7 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

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

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

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

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

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

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

7 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

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

7 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

7 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

7 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

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

7 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

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

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

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

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

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

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

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

7 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

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

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

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

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

7 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

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

7 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

7 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

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

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

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

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

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

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

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

7 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

7 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

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

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

7 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

7 years agoAdjust face menu links to "mirror uvs" and "mirror colors" to use the bmesh n-gon...
Andrew Wiggin [Fri, 2 Dec 2011 17:17:40 +0000 (17:17 +0000)]
Adjust face menu links to "mirror uvs" and "mirror colors" to use the bmesh n-gon-compatible replacements "reverse uvs" and "reverse colors"

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

7 years agoReverse default direction of "rotate colors" to match the (only rotation direction...
Andrew Wiggin [Fri, 2 Dec 2011 16:57:22 +0000 (16:57 +0000)]
Reverse default direction of "rotate colors" to match the (only rotation direction) of rotate colors in trunk

7 years agoRemove face menu (ctrl+f) links to f-gon commands
Andrew Wiggin [Fri, 2 Dec 2011 16:56:05 +0000 (16:56 +0000)]
Remove face menu (ctrl+f) links to f-gon commands

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

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

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

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

7 years agofix [#28645] TODO: dissolve edges doesn't delete lonely vertices on edges
Campbell Barton [Fri, 2 Dec 2011 05:54:48 +0000 (05:54 +0000)]
fix [#28645] TODO: dissolve edges doesn't delete lonely vertices on edges

dissolving a vert on 2 edges now uses 'JOIN EDGE KILL VERT'

also removed a fairly large block of code since 'jekv' handles this too.

7 years agosvn merge ^/trunk/blender -r42329:42333
Campbell Barton [Fri, 2 Dec 2011 03:32:59 +0000 (03:32 +0000)]
svn merge ^/trunk/blender -r42329:42333

7 years agochanges to derived mesh editmode functions to be in closer sync with trunk.
Campbell Barton [Fri, 2 Dec 2011 03:18:34 +0000 (03:18 +0000)]
changes to derived mesh editmode functions to be in closer sync with trunk.

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

7 years agofile rename, will do the same in trunk to make merges less of a hassle
Campbell Barton [Fri, 2 Dec 2011 02:18:29 +0000 (02:18 +0000)]
file rename, will do the same in trunk to make merges less of a hassle

7 years agosvn merge ^/trunk/blender -r42303:42329
Campbell Barton [Fri, 2 Dec 2011 01:01:07 +0000 (01:01 +0000)]
svn merge ^/trunk/blender -r42303:42329

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

7 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/

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

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

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

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

7 years agoAdd stubs for bad level calls found when doing a release build (including more featur...
Andrew Wiggin [Thu, 1 Dec 2011 18:36:36 +0000 (18:36 +0000)]
Add stubs for bad level calls found when doing a release build (including more features) while working on the last commit

7 years agoFix for [#29472] ctrl F in edition causes crash
Andrew Wiggin [Thu, 1 Dec 2011 18:35:45 +0000 (18:35 +0000)]
Fix for [#29472] ctrl F in edition causes crash

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)

7 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

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

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

7 years agoCycles
Brecht Van Lommel [Thu, 1 Dec 2011 16:33:21 +0000 (16:33 +0000)]
* 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.

7 years agoAdd missing properties to mesh select_all operator
Howard Trickey [Thu, 1 Dec 2011 14:12:43 +0000 (14:12 +0000)]
Add missing properties to mesh select_all operator

7 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

7 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

7 years agoFix for [#29467] Selection of active vertex color layer doesn't work
Andrew Wiggin [Thu, 1 Dec 2011 09:49:27 +0000 (09:49 +0000)]
Fix for [#29467] Selection of active vertex color layer doesn't work

Need to push active layer indices from loops & polys to faces again after tesselations