634be5992d
flush selection when switching weight paint vertex/face selection modes.
2012-12-22 13:42:06 +00:00
a462d69bbf
Another big patch set by Bastien Montagne, thanks a lot!
...
* Made Freestyle optional (turned on by default).
* Fix for missing bpath.c updates in the previous merge of trunk changes.
2012-12-20 07:57:26 +00:00
d433cd65f7
Merged changes in the trunk up to revision 53146.
...
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/intern/bpath.c
source/blender/blenloader/intern/readfile.c
2012-12-19 01:49:58 +00:00
01ab26770f
Fix some RNA subtypes for collections' active/active_index props (some PROP_POINTER had PROP_UNSIGNED!). Harmless, but stupid ;)
2012-12-11 14:11:46 +00:00
7fa096261a
Merged changes in the trunk up to revision 52118.
...
Conflicts resolved:
source/blender/makesrna/intern/rna_scene.c
2012-11-12 00:30:55 +00:00
2bb174cfa4
style cleanup: indentation
2012-11-09 09:33:28 +00:00
a8a2782d34
Merged changes in the trunk up to revision 51985.
2012-11-07 22:12:19 +00:00
34fecdd60e
code cleanup: use min/max functions rather then macros.
2012-11-07 12:31:05 +00:00
dd8e836067
Merged changes in the trunk up to revision 51853.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/bmesh/operators/bmo_utils.c
This commit also includes a fix of a bug identified during the merge and committed in revision 51853.
Thanks Thomas (dingto) for the timely fix!
2012-11-04 02:22:56 +00:00
a31449edad
all remove functions now invalidate the RNA objects passed, to help script authors to avoid bugs with accessing removed data.
2012-11-02 09:41:26 +00:00
55015daa43
Merged changes in the trunk up to revision 51448.
...
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c
2012-10-20 16:48:48 +00:00
a99b377167
More UI messages fixes and tweaks, and BKE_report<->BKE_reportf.
2012-10-20 10:28:34 +00:00
e91f33101f
Merged changes in the trunk up to revision 50956.
...
Conflicts resolved:
source/blender/editors/interface/resources.c
2012-09-30 13:16:55 +00:00
b0bf816ece
fix [ #32646 ] Duplifaces can have wrong orientation with ngons
...
concave ngons could flip the dupliface, now use the faces normal when calculating the dupli-face.
2012-09-25 00:20:42 +00:00
a42ba82f63
Merged changes in the trunk up to revision 50829.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/render/intern/source/convertblender.c
source/blender/render/intern/source/pipeline.c
Also addressed code inconsistency due to changes in the trunk revision 50628 (color
management with OCIO) and 50806 (UV project material). OCIO-related changes are marked
OCIO_TODO as in some other files modified in revision 50628.
2012-09-23 18:50:56 +00:00
6c1da4d022
code cleanup: make many functions static
2012-09-22 14:07:55 +00:00
f9467d28b9
remove sticky coordinates from blender, this was missing from the UI since 2.49.
...
TODO - drop support from the renderer still.
2012-09-21 11:19:16 +00:00
25c96bc9f3
code cleanup: remove unused macros, commet some which may be useful later - or good to keep for completeness. quieted some warnings and add flags -Wmissing-include-dirs and -Wno-div-by-zero to cmake/gcc
2012-09-20 01:02:39 +00:00
141dd5233e
Merged changes in the trunk up to revision 50257.
...
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
2012-08-29 00:53:29 +00:00
65d5a818b5
quiet unused function warnings in RNA for functions created by macros.
2012-08-20 07:29:11 +00:00
b7b5029814
Merged changes in the trunk up to revision 48695.
2012-07-06 23:46:48 +00:00
4149ea5f50
Last spell checking (for now).
...
Only mysterious courant from bpy.types.ParticleSettings.courant_target reamins...
2012-07-04 15:52:07 +00:00
558721ab59
More spell checking.
2012-07-04 15:04:38 +00:00
98a7ca61fa
Merged changes in the trunk up to revision 48505.
2012-07-03 00:02:45 +00:00
32478997ec
style cleanup
2012-06-27 18:29:47 +00:00
329b05dcd7
Merged changes in the trunk up to revision 47381.
...
Conflicts resolved:
source/blender/blenloader/intern/readfile.c
2012-06-03 21:11:10 +00:00
ef0c8d532a
Fix #31631 : keyframe insert on uv layer element not working.
2012-05-29 11:19:46 +00:00
0f04f7ce44
Fix #31632 : error inserting keyframing on vertex group element weight.
2012-05-29 11:00:12 +00:00
a537355426
Typo in property Description
2012-05-29 05:46:54 +00:00
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
396a3d31cc
Add MVertSkin DNA/RNA and customdata (CD_MVERT_SKIN).
...
The MVertSkin currently just stores local skin radii and skin
flags (MVertSkinFlag).
Skin modifier documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier
Reviewed by Campbell Barton.
2012-05-22 15:18:43 +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
d2895f0a59
Fix #31395 : setting mesh.uv_textures['uvmap'].active did not update correctly.
2012-05-18 15:06:26 +00:00
a9f6e54384
style cleanup: mostly whitespace in rna
2012-05-12 11:01:29 +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
c8cbe63947
Cycles: fix issues with texture coordinates and object scale. Auto texture
...
space size and location were outdated often, and already computed on demand
by blender internal, now do that through RNA as well.
2012-05-08 23:39:31 +00:00
c91cee2bb9
code cleanup: naming - BKE_mesh_*
2012-05-05 21:28:12 +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
f665c3cb00
py/rna api: remove selection and pin variable for texture faces - this is now stored in the loops.
2012-04-23 11:36:40 +00:00
1642e2888c
rename Mesh.uv_loop_layers --> uv_layers
...
add filtering for document generator to support --partial bpy.types.SomeType
2012-04-22 23:51:50 +00:00
5c89138684
style cleanup: comments
2012-04-22 11:54:53 +00:00
4a63eb9321
Added operators for adding the data paths to Freestyle edge/face mark properties of
...
selected edges/polygons into the active keying set. This makes it easy to keyframe
a number of Freestyle edge/face marks.
2012-04-22 00:59:27 +00:00
8765dfccf7
style cleanup: correct typos
2012-04-21 14:14:58 +00:00
79e2cd8fdf
Merged changes in the trunk up to revision 45383.
2012-04-04 00:50:41 +00:00
03479c04ed
fix [ #30608 ] Regression: BMesh merge broke customdata int/float/string layers
2012-04-03 11:19:58 +00:00
64d2a32f92
rna/py api - rename layers with polygon prefix, since there are edge and vertex layers too.
2012-04-03 11:10:26 +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
f469e0652a
Node socket values now only have soft limits, rather than hard limits, so you
...
can type in any value, and only when sliding the number value there is a limit.
It was already possible to assign any value to a socket with node linking, so
this shouldn't cause any new issues.
Also raised the limits on the math nodes, with a patch by Agustin Benavidez.
2012-03-30 16:09:05 +00:00
c9c66720c8
disallow adding tessfaces to a mesh with polygons (only allowed case is creating a new mesh with tessfaces and later converting to polygons, which wont work if polygons exist)
2012-03-26 04:32:04 +00:00
452f7c3868
setting the active texture layer from python would get the UV layer out of sync. (entering editmode would show the wrong UV layer)
2012-03-26 04:23:18 +00:00
