Campbell Barton
dd2a2ec699
removed nodes from CMake's BLENDER_LINK_LIBS, rewrote find-pcre using own template.
2011-09-14 01:23:17 +00:00
Campbell Barton
21253def7c
- removed some duplicate library links from cmake (which were needed because of bad level calls)
...
- FindXML2 we had copied from another project was always running and not using cached value, rewrote based on template used for most of our other find modules which makes use of 'FindPackageHandleStandardArgs'
- mark statuc collada libs as advanced.
2011-09-14 01:02:57 +00:00
Campbell Barton
1741269d30
resolve bad level calls from blenkenel/ into editors/ & remove editors from the include path from CMake & SCons.
...
* ED_curve_editnurbs --> curve_editnurbs
* ED_sculpt_modifiers_changed --> object_sculpt_modifiers_changed
2011-09-14 00:37:27 +00:00
Tamito Kajiyama
ac796827cb
Merged changes in the trunk up to revision 40189.
2011-09-13 22:24:59 +00:00
Jason Hays
272bdce84d
Re-added the interface template for vertex groups' checkboxes (they were cut out in a merge conflict)
2011-09-13 20:28:43 +00:00
Antony Riakiotakis
8a977cbcc9
fix compilation for MinGW by substituting qsort_r with qsort. What aversion do MinGW guys have for including '_r' variants of functions anyway?
...
Warning: a clean build will be needed probably to account for recent merge changes, or link errors will occur.
2011-09-13 19:51:58 +00:00
Campbell Barton
e67b2ee6eb
quiet compiler warnings
2011-09-13 14:38:05 +00:00
Andrew Wiggin
d48ee9d035
Submit of patch [ #28568 ] BMesh: make active element highlights work
2011-09-13 13:41:20 +00:00
Campbell Barton
214141e38e
fix for [ #28581 ] Rip Tool Gives Strange/Bad Results
...
Note that this just comments a check which I couldnt see any reason for, both edge split modifier and rip tool seem to work ok without it. so left the code in with an '#if 0'
2011-09-13 12:46:54 +00:00
Campbell Barton
e20936553c
some edits to make the split code easier to read, replace "j ? (i+1) % f->len : i" with a variable since its re-used so much, no functional change.
2011-09-13 12:42:04 +00:00
Campbell Barton
7d02e66256
svn merge -r40000:40179 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 10:05:30 +00:00
Campbell Barton
8a979c33ad
picky formatting edits - no functional changes.
2011-09-13 09:43:57 +00:00
Campbell Barton
92089e3c4d
svn merge -r39900:40000 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 09:07:20 +00:00
Campbell Barton
9c4165fde0
svn merge -r39800:39900 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 07:19:36 +00:00
Campbell Barton
b310a76a1b
svn merge -r39558:39800 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-13 06:39:17 +00:00
Campbell Barton
ee32d36a59
fix [ #28635 ] Mirror Modifier - Clipping still active when modifier is disabled
2011-09-13 05:00:54 +00:00
Tamito Kajiyama
6f418c55c8
Fix for a crash reported (four months ago!) by bupla, thanks!
2011-09-12 23:07:33 +00:00
Bastien Montagne
71f9397541
Fixes #28599 : Wrong re-assigning of layers in RenderLayer comp nodes when deleting a render layer.
...
Also added the check of comp nodetree of all scenes, as others might also use that scene in their compositing!
2011-09-12 17:27:02 +00:00
Campbell Barton
124d16aa14
correct bad maximum value, for wile-loop node, outside the range of a short.
2011-09-12 15:29:37 +00:00
Campbell Barton
88d1ce74cf
fix for typo in bevel code.
2011-09-12 15:13:31 +00:00
Campbell Barton
f7243ece07
remove redundant casts
2011-09-12 15:10:59 +00:00
Campbell Barton
a04003d648
svn merge -rr40148:40166 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-12 14:28:21 +00:00
Campbell Barton
97c78e25f0
fix for opencollada crash with r40164, missing NULL check.
2011-09-12 13:59:23 +00:00
Nathan Letwory
1dcf9c636c
Fix [ #28614 ] Collada Exporter does not export Ambient term
...
reported by Steiner Bernhard
ma->ambX is calculated only on a render, so instead of relying on those values compute them manually.
2011-09-12 13:20:24 +00:00
Campbell Barton
e16ba13251
use vector size and const args where possible (no functional change)
2011-09-12 13:00:24 +00:00
Thomas Dinges
c40492205b
Cycles:
...
* Remove RE_DO_RENDERED again, check for view_draw callback is sufficient.
2011-09-12 11:59:13 +00:00
Nathan Letwory
4a9a0ec3e4
Code shuffle so function has only one exit point.
2011-09-12 10:57:41 +00:00
Miika Hamalainen
46aede579e
Fix for bug #28332 : Smoke Simulation rendering artifacts.
...
Volume pre-caching altered shared data simultaneously in multiple threads, causing invalid scattering results when "Asymmetry" value was used. The view vector is now passed as a function argument.
2011-09-12 09:55:04 +00:00
Sergey Sharybin
b8bf0ee822
Fix #28613 : SEGFAULT: When setting Best-Quality on a Bump Map in GLSL viewport
...
Problem was caused by CRLF line ending instead of LF line ending.
Re-generate pu_shader_material to use LF line ending and made gpu codegen
treat \r as space character.
2011-09-12 09:47:28 +00:00
Campbell Barton
156e96762b
fix for changing font sizes with recent utf8 speedup
2011-09-12 09:12:34 +00:00
Bastien Montagne
d9894af950
Fixed "bug" #28611 : Subdiv value for icosphere should not be below 1.
2011-09-12 08:27:21 +00:00
Benoit Bolsee
5d695ed84a
Recast: attempt to fix compilation problem in Linux.
2011-09-12 07:38:00 +00:00
Campbell Barton
3e76e544ba
replace VECCOPY with copy_v3_v3
2011-09-12 05:51:35 +00:00
Campbell Barton
bee7f1ed78
replace BLI_arrays with simple malloc'd arrays since the size is known. add asserts to ensure the size is correct.
2011-09-12 05:51:04 +00:00
Campbell Barton
bf71aa3626
use BM_Make_Vert example argument rather then calling inline, was also copying vertex normals twice in quite a few places.
2011-09-12 05:24:45 +00:00
Campbell Barton
3996a820ff
fix for error copying normals in CDDM_To_BMesh, was copying short -> float with no conversion.
2011-09-12 05:21:47 +00:00
Campbell Barton
4f7fe76617
set some function args to const, no functional change.
2011-09-12 05:01:39 +00:00
Campbell Barton
fddc655aec
svn merge -r40140:r40148 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-12 04:57:20 +00:00
Campbell Barton
9a1f3c587e
- fix for mesh_get_mapped_verts_nors copying short normals to floats without scaling.
...
- BL_SkinDeformer also did this though for that case its not a problem because the normals are later accumulated anyway.
2011-09-12 04:29:35 +00:00
Campbell Barton
4bd0a2ba2d
replace VECCOPY -> copy_v3_v3, added copy_v*_v*_short too for typesafe copying, some parts of the code are copying float -> short normals without scaling. fix coming next.
2011-09-12 04:14:12 +00:00
Campbell Barton
2fa642b6e9
fix memory leak in array modifier not freeing editmesh, also use better names for allocs.
2011-09-12 02:44:17 +00:00
Campbell Barton
b82b8b4d05
fix [ #28587 ] Array modifier draws an extra object
...
patch [#28586 ] from Andrew Wiggin (ender79)
2011-09-12 02:36:14 +00:00
Campbell Barton
8c43e785d9
revert own commit r40051, mesh and object pointers are needed for undo, this commit caused bug [ #28625 ] Separate crash bug.
...
also added a safety check for the crash, even though reverting fixes.
bmesh_to_mesh_exec() could set me->mface array to NULL but leave me->totface when notellelation=1, which is likely to give trouble elsewhere.
2011-09-12 02:23:30 +00:00
Campbell Barton
471a86bf9c
cleanup for object color theme (no functional changes), could set the opengl color 2-3 times per object.
2011-09-12 01:43:20 +00:00
Campbell Barton
ca662d0fd6
svn merge -r40124:40140 https://svn.blender.org/svnroot/bf-blender/trunk/blender
2011-09-12 00:38:57 +00:00
Campbell Barton
56460a0340
fix for passing NULL to strstr() in visualkey_can_use()
2011-09-12 00:13:49 +00:00
Campbell Barton
2827ee26e5
fix for ntreeGPUMaterialNodes(), using uninitialized exec pointer.
...
also commented some set-but-unused variables.
2011-09-12 00:00:21 +00:00
Thomas Dinges
bf4f793b55
Cycles Render API:
...
* Show Rendered Viewport Shading only when the engine supports it.
Only enabled for Cycles now.
* Added RenderEngine flag RE_DO_RENDERED, which is an optional flag.
Exposed as bl_use_rendered in Python.
ToDo: When you are in Rendered mode and change to a engine which does not support it, the enum doesn't set properly to OB_SOLID.
2011-09-11 23:44:20 +00:00
Tamito Kajiyama
2ce1945c5e
Fix for a minor inconsistency in the use of stroke thickness values in
...
Strip::createStrip().
2011-09-11 22:28:12 +00:00
Peter Schlaile
8f9fa6a400
== Sequencer ==
...
Fixed silly bug, that activated proxies at the wrong time.
2011-09-11 21:46:24 +00:00