Commit Graph

47594 Commits

Author SHA1 Message Date
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
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
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
Sergey Sharybin
7f5c5f8eca Fix #28500: Reshape in multires modifier makes blender crash
Multires doesn't store displacement for base mesh and reshaping when
multires subdivision level is set to zero is crappy.

Add report that reshape can't work with base level and cancel reshape operator.
2011-09-04 11:38:53 +00:00
Sergey Sharybin
317908a330 Fix #28423: Screw-modifier crash in cunjunction with subsurf modifier
Problems was caused by angle=2*pi and steps=2 in screw modifier.
Such configuration produced duplicated geometry to close object
and it was confusing for subsurf cache.

Restrict steps=2 for screw modifier now, so now 3<=steps<=512.
2011-09-04 11:13:41 +00:00
Nathan Letwory
caa1acb6b1 Prevent potential crasher, commonEffects could be empty. 2011-09-04 02:12:03 +00:00
Mitchell Stokes
103b06d4df BGE animations: fixing initialization order issues for BL_ActionActuator and BL_ArmatureObject. Thanks to z0r for pointing them out and providing a fix. 2011-09-04 01:42:47 +00:00
Mitchell Stokes
70e3541f3a BGE animations: Fixing a potential crash when using camera IPOs. The IPOs were being created off of blendercamera->adt->action when they should have been using the supplied action. Thanks to z0r for pointing out the problem and a potential fix. 2011-09-04 01:27:16 +00:00
Nathan Letwory
cbc812b757 Fix [#28322] COLLADA imports messed up UVs
Reported by Chad Gleason

Imported index order could put mface->v4==0. We already know amount of verts, so use that instead.
2011-09-04 01:13:44 +00:00
Nathan Letwory
1764f2135d Some whitespace changes 2011-09-04 00:15:59 +00:00
Tamito Kajiyama
fce8733975 Merged changes in the trunk up to revision 39896. 2011-09-03 21:30:40 +00:00
Mitchell Stokes
1f8291f78d BGE animations: Adding a separate list to KX_Scene for animated objects. This makes scenes with a lot of non-animated objects faster. In my test scene with 8000 static, non-animated cubes my time spent on animations went from 1.5~1.7ms to 0.001ms. 2011-09-03 20:48:47 +00:00
Tamito Kajiyama
7db432d29d Merged changes in the trunk up to revision 39826.
Made a major amount of conflict resolution for code adaptation to
the animation system updates introduced in the Pepper branch recently
merged to the trunk.

Resolved conflicts:
source/blender/blenkernel/intern/anim_sys.c
source/blender/blenkernel/intern/library.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/anim_filter.c
source/blender/editors/animation/keyframes_draw.c
source/blender/editors/animation/keyframes_edit.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_channels.c
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_main_api.c
2011-09-03 20:48:43 +00:00
Mitchell Stokes
8295480bbe BGE animations: Fixing a crash that would happen if the property for a property mode action actuator was invalid. 2011-09-03 19:33:07 +00:00
Campbell Barton
451136e7c0 warning fixes 2011-09-03 15:36:36 +00:00
Howard Trickey
128e4acc9a Fixes for smooth shading of primitves.
Reverses order of vertices that weld op gives to make ngon so that it doesn't
reverse the normal from what it used to be.
Fixed a bunch of inconsistent normals in primitives: circle (made normal(s)
point up instead of down), uvsphere, icosphere, cylinder, and cone.
Reviewed at http://codereview.appspot.com/4959056/.
Cone and Cylinder still don't shade properly with ngon end caps, but that is now a different issue from normals.
2011-09-03 13:08:38 +00:00
Campbell Barton
58227c1016 svn merge -r39878:39890 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-03 12:57:33 +00:00
Campbell Barton
5c22d9f916 svn merge -r39877:39878 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merged manually 2011-09-03 12:39:17 +00:00
Campbell Barton
a01ffbbddb minor edits to build on openbsd 2011-09-03 09:43:20 +00:00
Nicholas Bishop
a6a14d0a1e == CustomData ==
* Added comments for each entry in the LAYERTYPEINFO array noting the
  number and name of the layer type; was hard to tell before which
  entry was what
2011-09-03 08:18:43 +00:00
Campbell Barton
8cc307b4f2 PyC_ExceptionBuffer is now threadsafe, used for converting exceptions into reports. 2011-09-03 06:46:31 +00:00
Campbell Barton
60dcfe2526 fix [#28462] Tiled textures and 2D filters don't mix
patch by Juha Mäki-Kanto
2011-09-03 04:44:18 +00:00
Campbell Barton
8e232af37c svn merge -r39831:39877 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-03 02:49:21 +00:00
Campbell Barton
0cd5dce245 whitespace edits 2011-09-03 02:15:49 +00:00
Sergey Sharybin
8e3d1084b2 Fix for grid lines drawing outside of histogram widget. 2011-09-02 19:25:32 +00:00
Sergey Sharybin
5193526aeb Add missed notifier when toggling object's force field. 2011-09-02 18:05:07 +00:00
Sergey Sharybin
87cb3f8519 Fix crash caused by recently added assert about if string was set properly.
Memory Estimate is actually 31 characters length, str[31] is a null-terminator.

Return length of 31 for memory estimate property. Returning proper length
would lead to slowdown because of 2x iteration through vertices.
2011-09-02 17:58:09 +00:00
Sergey Sharybin
2fb2075c5b Fix #28280: Insert Hook wrong index
Use quite easy and stupid approach like it used for shape keys:
re-make editmesh (editcurve or editlattice) before creating index array
for hook or storing vertex index in parenting object.

Even if hook was added in "current" edit mode, it should be re-mapped on
loading edit data because topology could be changed after it was created.
Such kind of re-loading edit structures is the easiest way for now to
update keyindexes to relevant state.

Also, fixed bug with not re-mapping indices for vertex-parented objects.
Really old error, not sure why it wasn't noticed yet.
2011-09-02 15:19:30 +00:00