ac9ec06ec1
Merged changes in the trunk up to revision 54421.
...
Conflicts resolved:
release/datafiles/startup.blend
release/scripts/startup/bl_ui/properties_render.py
source/blender/SConscript
source/blender/blenloader/intern/readfile.c
2013-02-10 10:17:59 +00:00
ba7e37c2b6
Fix #33874 : active UV map chooser in uv editor should not have X button as you
...
can't not have an active UV map.
2013-01-31 13:44:13 +00:00
556912792a
Merged changes in the trunk up to revision 54110.
...
Conflicts resolved:
source/blender/blenfont/SConscript
source/blender/blenkernel/intern/subsurf_ccg.c
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_scene.c
2013-01-26 23:49:13 +00:00
5f9ea0d7eb
move draw all edges into the object settings (object panel), makes more sense here since its next to draw extra wire
2013-01-18 19:01:26 +00:00
94ae0232b0
Merged changes in the trunk up to revision 53729.
...
Conflicts resolved:
release/datafiles/startup.blend
source/blender/blenloader/intern/readfile.c
2013-01-12 02:02:53 +00:00
ceb9701507
don't store bevel weights or edge crease customdata layers in editmode unless they are needed.
...
configurable in 'Geometry Data' panel, will be added when running crease edges transform for example.
2013-01-10 04:43:31 +00:00
f9c87b86fc
partial fix for [ #32581 ] Mesh properties API does not allow for zeros in byte array
...
bmesh access allows zero bytes, support still needs adding via RNA.
2013-01-09 13:25:46 +00:00
feccbaabbd
Merged changes in the trunk up to revision 53584.
...
Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/interface_templates.c
source/blender/makesrna/RNA_enum_types.h
Also made additional code updates for:
r53355 UIList - Python-extendable list of UI items
r53460 Alpha premul pipeline cleanup
2013-01-05 22:24:05 +00:00
1692f17c9b
fix for long standing annoyance with weight-paint mode selection.
...
There was no selection flushing when faces or verts were selected, this allowed incorrect selection states like selected face with unselected vertices.
add flush commands to paintface_flush_flags() and paintvert_flush_flags()
2013-01-01 13:08:07 +00:00
f54b6eee45
More wrong "in degrees" busted out of tips!
2012-12-31 15:54:44 +00:00
40449b1994
Merged changes in the trunk up to revision 53280.
2012-12-23 00:23:11 +00:00
7dca6dbf0b
code cleanup:
...
make vertex/weight flag names consistent
ME_EDIT_VERT_SEL --> ME_EDIT_PAINT_VERT_SEL
ME_EDIT_PAINT_MASK --> ME_EDIT_PAINT_FACE_SEL
also remove unused header BLO_soundfile.h
2012-12-22 14:25:34 +00:00
4c5093ad48
flush selection from vertex paint and weight paint modes when exiting, this isnt fool-proof, will need more work.
2012-12-22 14:20:27 +00:00
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
