b6a9a953bc
Merged changes in the trunk up to revision 47056.
...
Conflicts resolved:
source/blender/bmesh/bmesh_class.h
source/blender/bmesh/intern/bmesh_construct.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/convertblender.c
2012-05-26 22:22:45 +00:00
9dc161e8ed
Fix bug [ #31512 ] Focus Zoom on text object with modifers fails
...
Change BKE_object_minmax() to use the same logic as meshes: use the
object bounding box if available, since it will include the modifier
DM output.
2012-05-24 20:20:12 +00:00
dab1d8e487
style cleanup
2012-05-22 22:03:41 +00:00
45265b326a
Add operator to extract armature and vertex groups from skin.
...
* The operator creates bones for each input edge (does not subdivide
them like the skin operator does), adds a fake root bone for skin
roots with multiple children.
* The operator adds vertex weight groups to the original mesh.
* Make copy_object_transform() public, used to match the armature
object to the mesh object.
Skin modifier documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier
2012-05-22 15:29:57 +00:00
d435be750a
Fix #31522 : wrong ID user count on custom bone shape object after duplicate
2012-05-22 07:46:14 +00:00
2d2d36fe3b
code cleanup:
...
- style - multi-line ifs move braces onto new lines.
- iterators - convert some to macros, other split up and move brace.
2012-05-20 19:49:27 +00:00
a5152b7ca0
Merged changes in the trunk up to revision 46787.
...
Conflicts resolved:
source/blender/blenkernel/intern/idcode.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/include/UI_resources.h
source/blender/makesrna/intern/rna_main.c
2012-05-19 08:40:56 +00:00
9a8f98ddd8
Blender Internal Render: Split quads to predictable (vertices 0,1,3) triangles for animated meshes.
...
This solves problems with collisions beeing rendered different than in viewport.
2012-05-15 13:39:44 +00:00
305d341ec2
code cleanup: use vector math function minmax_v3v3_v3() and other minor vector function edits.
2012-05-13 11:05:52 +00:00
8925ed1420
Merged changes in the trunk up to revision 46557.
...
Conflicts resolved:
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_channels_defines.c
source/blender/makesrna/intern/rna_scene.c
Additional changes:
* Fix for recent changes of BKE_* function renaming.
* Fix for an "attempt to free NULL pointer" in BlenderStrokeRenderer::RenderStrokeRepBasic().
2012-05-11 22:48:41 +00:00
3ef11693f5
Style cleanup: displist module
2012-05-07 06:58:03 +00:00
c7b20e79cd
Style cleanup: rename BKE_metaball* to BKE_mball -- mball is more commonly used term in Blender
2012-05-07 06:38:41 +00:00
c93d7a193a
style cleanup: BKE_*.c files which deal with library functions
2012-05-06 15:15:33 +00:00
c91cee2bb9
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +00:00
1dccd4c98a
code cleanup: naming - pose/armature/image
...
also use ..._find_name(..., name) rather then ..._find_named(..., name) --- both were used.
2012-05-05 16:03:57 +00:00
299ff91ea1
code cleanup: BKE_scene api naming.
...
also stop numpy from being found in /usr/include with cmake.
2012-05-05 14:33:36 +00:00
a731e13043
code cleanup: function naming, use BKE_*type* prefix.
2012-05-05 14:03:12 +00:00
bb1f8d9586
Merged changes in the trunk up to revision 46309.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c
2012-05-05 11:40:42 +00:00
084fedd03a
code cleanup: brush/camera naming
2012-05-05 00:58:22 +00:00
b075765edd
Fix #31258 : collada now selects newly added objects after import.
2012-05-03 21:32:49 +00:00
a5af5e8f50
style cleanup: re - http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Braces_with_Macros
2012-04-30 16:22:40 +00:00
1d8c798188
Cycles: support for motion vector and UV passes.
...
Most of the changes are related to adding support for motion data throughout
the code. There's some code for actual camera/object motion blur raytracing
but it's unfinished (it badly slows down the raytracing kernel even when the
option is turned off), so that code it disabled still.
Motion vector export from Blender tries to avoid computing derived meshes
when the mesh does not have a deforming modifier, and it also won't store
motion vectors for every vertex if only the object or camera is moving.
2012-04-30 12:49:26 +00:00
60c9addf79
- improve select grouped prefix/suffix from recent patch
...
- added select similar direction (Y axis)
2012-04-30 08:24:44 +00:00
e701f9b670
style cleanup: whitespace / commas
2012-04-29 15:47:02 +00:00
2585d52405
Merged changes in the trunk up to revision 46045.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesdna/DNA_scene_types.h
2012-04-29 00:59:04 +00:00
f88cfd9168
Code and style cleanup in own modules in BKE and also mball module
...
- Make sure functions are named in way BKE_<object>_<action> (same way as RNA callbacks)
- Make functions which are used by mball.c only static and remove their prototypes
from public header file.
Further cleanup is coming.
2012-04-28 16:49:00 +00:00
ef054e165c
style cleanup: format 'for' loop macros the same as for loops, some renaming to BLI_array macros.
2012-04-28 15:14:16 +00:00
b340f930ec
style cleanup: changes to brace placement / newlines - for/while/if/switch
2012-04-28 06:31:57 +00:00
b56aabf815
style cleanup: multi-line if statements.
2012-04-21 15:11:03 +00:00
cdbfd1db38
Merged changes in the trunk up to revision 45820.
...
Conflicts resolved:
source/creator/creator.c
2012-04-21 00:33:36 +00:00
475ecbb0ce
remove BM_ITER, BM_ITER_INDEX macros, use ELEM or MESH variants only (the maceros had unused args in both cases).
2012-04-19 13:47:58 +00:00
75b869e428
style cleanup: BM_ITER / BM_ITER_INDEX / BMO_ITER
2012-04-19 11:44:12 +00:00
4a19ccfa5f
Merged changes in the trunk up to revision 45619.
2012-04-14 10:38:11 +00:00
4c9486f13d
change add_keyblock() not to sort keyblocks by time since this can be a problem when using the function in lower level parts of the code, instead add add_keyblock_ctime() which sets time and sorts on absolute shape keys.
2012-04-12 11:05:16 +00:00
b4a0152e76
code cleanup: float formatting was confusing in some cases - eg: (0.,0.,0.)
2012-04-11 08:15:13 +00:00
4c36a26af5
Merged changes in the trunk up to revision 45308.
...
Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c
2012-03-31 22:09:43 +00:00
5b88712ff9
move debug flag into its own global var (G.debug), split up debug options.
...
--debug
--debug-ffmpeg
--debug-python
--debug-events
--debug-wm
This makes debug output easier to read - event debug prints would flood output too much before.
For convenience:
--debug-all turns all debug flags on (works as --debug did before).
also removed some redundant whitespace in debug prints and prefix some prints with __func__ to give some context.
2012-03-31 00:59:17 +00:00
126c9d4caa
use cmake WITH_MOD_ * to exclude include paths which are not used.
2012-03-27 00:17:57 +00:00
7e38b49f26
fix for possible crash using freed ObCenter pointer when loaing a blend file without loading the UI.
2012-03-26 07:28:31 +00:00
6faeac9fe2
style cleanup: add braces around checks - 'if ELEM() {...}', confuses some parsers that done expand macros.
2012-03-25 22:35:18 +00:00
3b711a6ed0
Merged changes in the trunk up to revision 45133.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/bmesh/intern/bmesh_construct.c
source/blender/bmesh/intern/bmesh_mesh_conv.c
source/blender/bmesh/intern/bmesh_mesh_conv.h
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/bmesh_select.c
source/blender/editors/mesh/bmesh_tools.c
source/blender/editors/space_view3d/drawobject.c
source/blender/render/intern/source/shadeoutput.c
2012-03-25 08:20:19 +00:00
69e6894b15
style cleanup: follow style guide for formatting of if/for/while loops, and else if's
2012-03-24 06:18:31 +00:00
4f19c1a995
spelling cleanup
2012-03-18 07:38:51 +00:00
a527e3ea25
Fix #30496 : Bugs and crashes about "make links modifers" function.
...
Was missed check for if modifier is available for particular object type
which ended up with unpredictable results when modifier which isn't supported
yet for some object type as linked to that object type.
2012-03-12 14:35:07 +00:00
a2ebfc82db
Merged changes in the trunk up to revision 44797.
...
Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c
2012-03-10 21:56:23 +00:00
95670e03a0
style cleanup / comment formatting for bli/bke/bmesh
2012-03-03 20:19:11 +00:00
9e93fc1e8a
Merged changes in the trunk up to revision 44612.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/bmesh.h
2012-03-03 01:43:44 +00:00
622ac0dd16
code cleanup:
...
replace casts: '((Mesh *)ob->data)->edit_btmesh' with 'BMEdit_FromObject(ob)'
also minor style edits.
2012-03-02 12:09:49 +00:00
35708fe150
Merged changes in the trunk up to revision 44561.
...
Conflicts resolved:
source/blender/bmesh/bmesh.h
source/blender/bmesh/bmesh_operators.h
source/blenderplayer/bad_level_call_stubs/stubs.c
2012-02-29 21:35:49 +00:00
ed04c21374
code cleanup: use float vector size in function definitions, and const's where the values are unchanged.
2012-02-28 14:05:00 +00:00
