Commit Graph

66005 Commits

Author SHA1 Message Date
Xiao Xiangquan
8ff7f6104e fix the setenv bug on windows 2011-09-06 05:18:02 +00:00
Campbell Barton
d44982508e fix for make vertex parent (reported todo) 2011-09-06 05:04:26 +00:00
Campbell Barton
0093440fdb fix crashing when setting the vertex parent. 2011-09-06 04:50:01 +00:00
Campbell Barton
2bdc70d18c fix for flip normals 'inside' option not working. 2011-09-06 04:06:05 +00:00
Campbell Barton
e351082114 patch [#28518] BMesh: fix 28491 (implement edge tag shortest path)
from Andrew Wiggin (ender79)
2011-09-06 03:32:58 +00:00
Campbell Barton
6d4b46d96f patch [#28488] BMesh: fix for extrude individual faces
by Andrew Wiggin (ender79)
2011-09-06 03:21:55 +00:00
Campbell Barton
e74e245030 svn merge -r39890:39951 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-06 03:16:12 +00:00
Campbell Barton
7495757553 svn merge -r39890:39889 source/blender/editors/object/object_relations.c source/blender/editors/object/object_hook.c
This change has been reverted in trunk so reverse merging the merge.
2011-09-06 01:23:43 +00:00
Campbell Barton
fa32395b33 more minor doc fixes 2011-09-06 00:41:28 +00:00
Campbell Barton
c643363905 svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-06 00:31:00 +00:00
Campbell Barton
67712c10c4 fix for doc building after pepper merge, also WIP tips/tricks. 2011-09-06 00:12:34 +00:00
Campbell Barton
bf5a6531a6 replace define '#if FFTW3==1' --> '#ifdef WITH_FFTW3' 2011-09-05 23:46:08 +00:00
Campbell Barton
0991bed413 fix some complier warnings and add -Wundef to CMake's default GCC warnings. 2011-09-05 23:40:52 +00:00
Nathan Letwory
0c992c73a1 Typofix 2011-09-05 22:15:07 +00:00
Guillermo S. Romero
271f069b85 SVN maintenance. 2011-09-05 22:04:30 +00:00
Lukas Toenne
82f19e8df2 Fix for blender player linker bug, missing a stub function used in RNA. 2011-09-05 22:04:23 +00:00
Nathan Letwory
3efe867051 Put dead zone printout behind debug. 2011-09-05 21:52:06 +00:00
Lukas Toenne
8e0fe8bff7 Merged the particles-2010 branch with node improvements into trunk.
This branch adds mostly organizational improvements to the node system by renaming the node folders and files. A couple of internal features have been added too.
Detailed information can be found on the wiki page:

http://wiki.blender.org/index.php/User:Phonybone/Particles2010
2011-09-05 21:01:50 +00:00
Nathan Letwory
6e9ff495eb Add parser error handler.
OpenCOLLADA is a validating parser, so is pretty strict about document form. The added error handler will print out any errors the parser finds. A pop-up will be shown too, advising the user to check the console for the error log.
2011-09-05 20:41:58 +00:00
Brecht Van Lommel
59a823c48a Code cleanup: remove context from RNA update functions, only one left. 2011-09-05 19:34:27 +00:00
Brecht Van Lommel
a6d9a5a972 Code cleanup: warning fixes. 2011-09-05 19:27:21 +00:00
Brecht Van Lommel
76ddf6d2ee Fix #28404: certain keyboard shortcuts not shown in menus, e.g. move operators
in graph editor > channel menu. Problem was these did not inherit operator
execution context correctly.

Fix found by Sergey, also needed to fix logic operators which were not working
when invoked instead of executed.
2011-09-05 17:57:04 +00:00
Miika Hamalainen
42faf7ae41 Merge with trunk r39928 2011-09-05 17:06:09 +00:00
Bastien Montagne
5a3c6ccadb Merging r39847 through r39930 from trunk into vgroup_modifiers. 2011-09-05 16:27:25 +00:00
Brecht Van Lommel
419042af55 Fix #28394: clouds texture error with high noise depth and blender original
noise, patch from Campbell,
2011-09-05 16:25:42 +00:00
Bastien Montagne
4393df9320 VGroup Modifiers: added mapping options to proximity and edit.
*Added Smooth/Sharp/Root/etc. mappings to WeightVGEdit modifier, in addition to custom curve one.
*Added Smooth/Sharp/Root/etc. mappings to WeightVGProximity modifier, without the custom curve one!
*Factorized the common mapping code into MOD_weightvg_util.
2011-09-05 16:16:00 +00:00
Miika Hamalainen
79ef35889f Dynamic Paint:
* Added "Initial Color" setting for surfaces. You can for example set color from UV mapped texture or from vertex colors.
* Added clamping option for "wave" brushes.
* Merged smudge and drip adjacency search code. This fixes some issues with drip effect and makes code easier to maintain.
* Some adjustments to the bounding box generation code.
* OpenMP is now completely disabled if no compile flag is set.
* Wetness values are now properly clamped on vertex surfaces. No more black dots on >1.0 wetness.
* Textured brushes now use same function calls as internal renderer, instead of modified duplicates.
* Moved operator code to editors/physics/.
* Re-enabled some particle brush optimizations.
* Fixed sometimes incorrect volume brush influence.
* Fixed possible crash when using a brush that uses "Voxel Data" texture simultaneously with material preview or render.
* Fixed texture mapping issues for "Object Center" brush.
* Fixed possible crash/corruption when duplicating brush object that uses color ramps.
* Other tweaking and code cleanup.
2011-09-05 16:04:15 +00:00
Brecht Van Lommel
59dbd53e72 Fix #28389: UILayout.menu function didn't emboss menu button correct in the
3d view tools region.
2011-09-05 15:55:53 +00:00
Nathan Letwory
cc1c8268f7 Left debug print accidently enabled. 2011-09-05 15:03:31 +00:00
Xiao Xiangquan
034cda72d3 add missing files after merging 2011-09-05 14:44:11 +00:00
Brecht Van Lommel
d91587752c Fix #28504: lib linking errors were not shown when opening a file from
the splash screen.
2011-09-05 13:19:19 +00:00
Brecht Van Lommel
7d9d9fa976 Cycles: use workgroup size from opencl, attempt to fix issue with apple opencl. 2011-09-05 12:24:28 +00:00
Brecht Van Lommel
f3ee10ce5c Cycles: remove -Werror from opencl compile options, apple opencl on lion
seems to give "no previous prototype for function" warning, but it doens't
make much sense in opencl, seems like a compiler bug?
2011-09-05 08:23:01 +00:00
Sergey Sharybin
919bd181b7 Partial revert commit 39878 "Fix #28280: Insert Hook wrong index"
Such load/make edit structures introduced regression into iterators
via object's geometry (vertices, edges, control points and so) when
adding hooks in the body of this iterator.

Fix for wrong index should be non-destructable for geometry.

This will fix #28506: Unusual behavior in curves.
2011-09-05 08:20:11 +00:00
Campbell Barton
3126ab835d [#28498] BMesh: fix 28481
by Andrew Wiggin (ender79)

This fixes a loop bug in bmesh.
2011-09-05 06:53:30 +00:00
Campbell Barton
cc906e0e2a correct float -> double promotion warnings 2011-09-05 05:43:01 +00:00
Daniel Salazar
3b09c331fa Adding noise module by default in driver_namespace
http://www.pasteall.org/blend/8677
2011-09-05 05:42:49 +00:00
Campbell Barton
e5209c2059 - vertex group modifiers isDisabled functions were incorrect, need to check if the string is set: == NULL will never be true.
- was doing NULL checks on freeing memory in cases where the values were already accessed (blender would have crashed anyway), so remove the NULL checks.
- use deform.c api weight functions to replace inline weight lookups in some cases.
- change if checks in weightvg_do_mask() so its more obvious whats going on.
2011-09-05 05:28:32 +00:00
Campbell Barton
2c740a9b5e rename vertex group mix "vgroup, vgroup2" to "vgroup_a, vgroup_b"
also clamp more values between 0.0 and 1.0
2011-09-05 04:53:23 +00:00
Campbell Barton
e8346fa84c simplify get_vert2ob_distance, mat4_to_loc_rot_size isnt needed. 2011-09-05 04:00:08 +00:00
Campbell Barton
1ba71e2caf change proximity method since minimum distance of 0.0 wasnt working at all. 2011-09-05 03:53:26 +00:00
Campbell Barton
5fd8ffd242 - mask_tex_map_obj --> mask_tex_map_object
- dont allow negative min distances
2011-09-05 03:26:49 +00:00
Campbell Barton
57411d1c5f minor edits.
- init proximity to 1.0f
- min/max proximity dist were not being copied.
- minor edits to comments - use ascii chars in a few places.
2011-09-05 03:09:49 +00:00
Nathan Letwory
5c5b9cf4d7 Remove NULL-checks, as they might cause infinite loops while reading a DAE containing unsupported data, i.e. <lines> geometry. 2011-09-04 22:14:28 +00:00
Howard Trickey
7b21ec2307 Patch 28495 from Andrew Wiggin (ender79) to fix bug 28494 - make edge and ring walkers more like trunk behavior for rmb select with non-manifold edges. 2011-09-04 18:36:27 +00:00
Sergey Sharybin
f1eab8e853 Fix #28503: Selecting a Grease Pencil from the Properties panel does not update 3D View
Added missing notifiers.
2011-09-04 15:53:12 +00:00
Antony Riakiotakis
6edb09fe93 Compile fixes for MinGW, checked with basic initial setup, no CUDA, gcc 4.5.2.
OpenImageIO still gives link-time errors, will try to make a lib for MinGW, see if it is fixed.
2011-09-04 15:39:09 +00:00
Howard Trickey
fc4ed9bcfb Patch 28492 from Andrew Wiggin (ender79) to fix loop deselect problem (bug 28492)
This disables, at least for now, some code that was marked as 'not 100% reliable' that was breaking trunk behavior.
2011-09-04 14:59:20 +00:00
Xiao Xiangquan
d31d7fd487 use SetEnvironmentVariableA to set env var on windows 2011-09-04 14:32:32 +00:00
Nathan Letwory
1cada203bc [#27884] Collada import: materials mismatch when 2 instance_geometry reference the same material
Reported by David Roy

Multi-materials used on different meshes would get ignored (resulting in white faces in textured view).
2011-09-04 14:31:23 +00:00