Commit Graph

49420 Commits

Author SHA1 Message Date
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
Brecht Van Lommel
1135875ab1 Cycles:
* Fix crash in light path node
* Fix struct alignment issue for cuda
* Fix issue with instances taking up too much memory
* Fix issue with ray visibility working incorrect on some objects
* Enable OpenCL always and remove option, it has no dependencies so may as well
* Refuse to load kernel if OpenCL version < 1.1, recent drivers are needed
* Better error handling for OpenCL device
* 3D views with rendered draw mode will now revert to wireframe on file load
2011-09-02 14:55:06 +00:00
Sergey Sharybin
6b4bdf621f Fix #28467: Crash while deleting objects in outliner too fast
Cleanup tree when handling object delete from outliner.
Prevents handling the same tree item twice when clicking fast.
2011-09-02 13:23:44 +00:00
Brecht Van Lommel
b56ffd2cdb Cycles: svn merge -r39669:39870 https://svn.blender.org/svnroot/bf-blender/trunk/blender 2011-09-02 12:33:29 +00:00
Joshua Leung
3386563368 Bugfix [#28435] Key Visual transform and Parenting not working
After reviewing this code, it seems that this case can work after all.
However, several things needed to be tweaked:
1) Removed check which stopped parented objects from getting the
visual keying coordinates determined. This actually wasn't doing
anything, given that this case would never occur as...
2) Tweaked the visualkey_can_use() function to also consider parenting
as a cause for visual-keying to be necessary.
2011-09-02 12:26:57 +00:00
Campbell Barton
15afd240e0 paranoid check that RNA string functions set the string, would have helped solve keymap search bug.
disabled in release mode.
2011-09-02 10:43:51 +00:00
Howard Trickey
ee22fe7bac Bmesh: fix array copies (fixes snapping), from patch #28429 by Andrew Wiggin (ender79 2011-09-02 10:43:16 +00:00
Sergey Sharybin
7a496bfbcf Partial fix for #28441: Tab width in texteditor ignored if used tabs as spaces
Scroll to cursor when displaying text datablock was changed.
This behavior was lost in 2.5x.
2011-09-02 09:39:21 +00:00
Campbell Barton
612e2d4dbe patch [#28473] Outliner Simple Todo
from Julien DUROURE (julien)

---

* right click --> rename, as proposed on http://wiki.blender.org/index.php/Dev:2.5/Source/Development/Todo/Simple_Todos

* implementation of Toggle visibility/rendarability/selectability on right click on Groups ( was in menu, but not implemented )
2011-09-02 08:35:46 +00:00
Campbell Barton
8276989f63 fix [#28460] SEGFAULT when trying to make empty display as image 2011-09-02 08:20:30 +00:00
Campbell Barton
1d9ddcd319 tweak to WM_operatortype_find to perform better when called with empty strings (as the keymap editor does a lot) 2011-09-02 08:01:01 +00:00
Campbell Barton
e6ff3df5b9 fix for keymap search, was using uninitialized memory when the keymaps operator couldn't be found. 2011-09-02 07:51:19 +00:00
Campbell Barton
bffd4b5eee patch [#28463] BMesh: fixes for removedoubles and friends
from Andrew Wiggin (ender79)
2011-09-02 06:48:14 +00:00
Campbell Barton
dc7f56455c fix for error in recent commit, when audaspace is enabled 2011-09-02 04:34:58 +00:00
Campbell Barton
dc463db6c2 Credits generator which cross references with the patch tracker to credit the original authors.
the script has a unix-name <> real-name mapping which is not totally complete since I couldn't find everyones real names.

In this case the commit name is credited.

Also added a link to the credits page in the splash.
2011-09-02 03:42:16 +00:00
Campbell Barton
1f7b41775b minor warning fixes, also correct some float -> double promotions in shadeoutput.c 2011-09-02 03:32:57 +00:00
Brecht Van Lommel
5feb921eba Cycles: revert fix for integrator preset refresh, it causes continuous
redraw leading to high cpu usage, need to find better solution.
2011-09-01 22:53:11 +00:00
Mitchell Stokes
99d5fa70de BGE animations: This is an attempt to help smooth out some more compatibility issues with the new action actuator. It now has a similar pulse behavior to the old actuator. This has worked well in most of my tests, but YoFrankie still has problems, and it appears to have gotten a little worse. 2011-09-01 21:47:46 +00:00
Mitchell Stokes
0f2be67bbf BGE: Undoing r39729 and applying a simpler fix (ensuring that the viewport is correct for PostRenderScene()). This way both 2d filters and post_draw callbacks with with multiple viewports. 2011-09-01 19:53:14 +00:00
Brecht Van Lommel
27102bfec4 Cycles: OpenCL library is now dynamically loaded so that blender doesn't crash
if it's not installed on the system.

Code copied from clew.h/clew.c in CLCC:
http://clcc.sourceforge.net/
2011-09-01 19:00:23 +00:00
Bastien Montagne
e4fd20c20c Merging r39652 through r39842 from trunk into vgroup_modifiers. 2011-09-01 17:49:57 +00:00
Brecht Van Lommel
cf9d1e23c8 Cycles: fix missing update when setting integrator preset. 2011-09-01 16:27:40 +00:00
Brecht Van Lommel
df625253ac Cycles:
* Add max diffuse/glossy/transmission bounces
* Add separate min/max for transparent depth
* Updated/added some presets that use these options
* Add ray visibility options for objects, to hide them from
  camera/diffuse/glossy/transmission/shadow rays
* Is singular ray output for light path node

Details here:
http://wiki.blender.org/index.php/Dev:2.5/Source/Render/Cycles/LightPaths
2011-09-01 15:53:36 +00:00
Xiao Xiangquan
981f7fcd0d merge with trunk r39834 2011-09-01 15:08:32 +00:00
Campbell Barton
a8e49cd55a use a fixed 32byte buffer for getting an rna string from python. gives a slight speedup when drawing heavy UI's 2011-09-01 09:47:21 +00:00