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
caba2601ea
fix for fix, own fix for [ #31368 ] didnt work right, now move shadeless & wire paint drawing into draw_mesh_paint().
2012-05-10 06:32:24 +00:00
1f223801d4
some speedups for face angle drawing
...
- avoid calculating face center when the face isnt used at all.
- avoid copying vectors when its not needed.
2012-05-09 16:43:09 +00:00
b52d55f266
fix [ #31378 ] Face Angle Rounding To Agressive/Not done in 2.49x?
2012-05-09 15:43:02 +00:00
d20c129a9c
style cleanup: whitespace/operators
2012-05-09 09:24:15 +00:00
94fa7060a8
fix [ #31368 ] No masking drawn in Weightpaint-mode when displayed as wireframe
2012-05-09 06:22:29 +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
80a766cbd0
style cleanup: view3d
2012-05-08 15:55:29 +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
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
34b18fcbc1
code cleanup: BKE_ naming, also make bpy.data.images.load() always load a new image. (not use existing one)
2012-05-05 14:52:04 +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
8b1c1e9f61
code cleanup: use much simpler (and likely faster) polygon normal calculation in object mode.
2012-05-04 13:13:45 +00:00
a0ce240de9
Renamed "fake" OpenGL identifiers.
...
Any identifier that looks like an OpenGL identifier, but isn't, causes a false alarm by the glreport.py tool. Most of these were in comments so I just rephrased the comments. There were a couple of static functions/macros that were easy enough to rename. Only the glTexco and glIndex fields of the DMVertexAttribs struct was public and had non-local uses.
2012-05-04 11:50:11 +00:00
d6be860d31
bmesh: use fixed stack size for face flipping array.
...
also quiet unused var warnings
2012-05-02 11:10:54 +00:00
d47499f6fc
Fix #31199 & #31112 : cycles not working well with vertex/weight paint selection
...
mask drawing.
Now refactored the code a bit so that in no longer calls textured mesh drawing
for the face mask drawing, just handle it as part of regular paint color drawing.
Should also make the blender internal behavior more logical where it would start
showing textures in solid mode when enabling face masking.
2012-05-02 10:52:29 +00:00
933b3166fc
style cleanup: guys - set your editors to tabs!
2012-05-01 17:51:03 +00:00
6527f42b6b
Fix #31193 : Normals don't have any Z component
...
Issue was caused by heavily non-uniform scale applied on object.
Run scale correction on face and vertex normals draw if there's non-uniform scale.
2012-05-01 11:01:24 +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
1b47e2678e
style cleanup: missed these from previous cleanup
2012-04-29 17:55:54 +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
0943f4bc77
now vertex paint uses the same overrides as weight paint - so wire draw mode allows vertex paint to be unlit (which is quite handy, previously you had to hide lamps).
2012-04-24 23:47:10 +00:00
16ff7e40e6
code cleanup: change C naming convention (so py and C api match), eg:
...
C: BM_face_calc_area(f), Py: BMFace.calc_area()
2012-04-23 01:19:50 +00:00
b56aabf815
style cleanup: multi-line if statements.
2012-04-21 15:11:03 +00:00
6701933f5c
style cleanup
2012-04-21 12:51:47 +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
b40476455e
code cleanup: remove unused BMesh args.
2012-04-19 14:38:09 +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
3f605bff4b
Scons:
...
* Add new scons options to 'blenderlite' target
* Remove ancient yafray comment
2012-04-14 22:33:48 +00:00
4a19ccfa5f
Merged changes in the trunk up to revision 45619.
2012-04-14 10:38:11 +00:00
2a5a465e2c
Fix part of #30917 : solid + glsl + textured solid in texture paint mode did not
...
show textured solid as it should, was using glsl instead.
2012-04-12 17:34:29 +00:00
b4a0152e76
code cleanup: float formatting was confusing in some cases - eg: (0.,0.,0.)
2012-04-11 08:15:13 +00:00
1f3e453509
fix [ #30848 ] Edge Selection fails when the following Conditions met:
...
summery: when both verts are outside the viewport
this is in fact a very old annoyance but good to resolve.
fix by doing segment/rectangle intersection between the edge and the viewport so it works when the both verts are outside the view.
2012-04-10 07:30:08 +00:00
d5953568c8
use 'const float[3]' for derived mesh callback args.
2012-04-09 07:06:06 +00:00
79e2cd8fdf
Merged changes in the trunk up to revision 45383.
2012-04-04 00:50:41 +00:00
f137ba074a
Fix #30789 : cycles still taking into account textured solid option when it should
...
have no effect.
2012-04-03 14:08:04 +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
09f29c0b70
style/name cleanup: have EDBM_* functions match our style guide and also match BM_ function naming conventions
2012-03-27 04:46:52 +00:00
09144c3756
style cleanup: mostly whitespace around operators
2012-03-25 23:54:33 +00:00
4457e85442
style cleanup: dont use 'else for' for extended blocks of code (quite confusing)
2012-03-25 23:12:42 +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
