4ea2fb8b0a
Merged changes in the trunk up to revision 49478.
...
Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c
2012-08-02 00:10:05 +00:00
6a6bcea817
Fix #31800 : Blender crash by rendering in connection with linked groups
...
Seems the issue was caused by render layer node overwritng active scene
when render button is clicked. It lead t situations when job was adding
with owner of rendering scene, but modal callback was checking for render
jobs existing for current active scene. There was no such jobs so operator
used to finish at this point and free report list used by render pipeline.
Solved by storing operator owner in operator's custom data. Probably
there's nicer way to do fix this issue but currently can't think of it.
2012-08-01 19:22:04 +00:00
93c29aaeb1
Fix #32187 : OpenGL preview does not take into account overwrite option
2012-07-27 08:58:34 +00:00
065605e0da
Merged changes in the trunk up to revision 48893.
...
Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/animation/anim_filter.c
source/blender/makesrna/RNA_enum_types.h
2012-07-13 23:23:06 +00:00
cfb7aee017
style cleanup
2012-07-07 22:51:57 +00:00
b7b5029814
Merged changes in the trunk up to revision 48695.
2012-07-06 23:46:48 +00:00
468ef74ed7
More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize).
2012-07-03 19:09:07 +00:00
8135cc9f95
Merged changes in the trunk up to revision 47700.
...
Conflicts resolved:
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/DNA_action_types.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/SConscript
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/windowmanager/WM_types.h
2012-06-10 20:50:43 +00:00
874308ba5e
Cycles: show frame number in render info.
2012-06-04 16:09:51 +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
04466171c1
fix for crash when loading a file while rendering.
2012-06-01 15:05:30 +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
6b554c5ec4
Fix for last commit, forgot to update Screen.is_animation_playing python property.
2012-05-25 12:56:29 +00:00
ad65b7b86b
Animation playback: now all windows are update during playback, rather than
...
just the active window.
2012-05-25 12:37:11 +00:00
af3e348430
code cleanup: use TRUE/FALSE rather then 1/0 for better readability, also replace do prefix with do_ for bool vars.
2012-05-19 13:28:19 +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
89d36e7457
Fix [ #31465 ] Segmentation Fault when Ctrl+Up/Down arrow to restore size of 3d Viewport.
...
Simply added a check for NULL pointer...
2012-05-15 12:14:03 +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
a986ece4b3
fix : #31374 Wrong/Missleading hint texts in material assignment. (as clarified with Daniel Salazar & Campbell Barton)
2012-05-09 19:40:54 +00:00
44ee52ab4b
fix : #31374 Wrong/Missleading hint texts in material assignment.
2012-05-09 17:14:16 +00:00
69fc654f94
Style cleanup: change ffmpeg, avi and frame server api to rna-ish naming style
2012-05-07 09:30:15 +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
4c5502bfd6
code cleanup: function naming for BLI functions.
2012-05-05 00:23:55 +00:00
eec8de9469
Fix #31254 : OpenGL-Rendering dark without Effect-Strip
...
Issue was caused by the fact, that sequencer is working in sRGB space, but
when there's only image input strips we need to make sure conversion from
byte to float buffer would keep float buffer in sRGB space and wouldn't
make it linear as it's supposed to be in other areas.
2012-05-03 11:54:12 +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
112162e09e
code cleanup: header cleanup
2012-04-30 14:24:11 +00:00
1b47e2678e
style cleanup: missed these from previous cleanup
2012-04-29 17:55:54 +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
ec6c3f632e
Fix #31066 : cycles keeps rendering in viewport after window closed.
2012-04-26 12:30:37 +00:00
4782522379
Add libMV and Scons support for MinGW-w64, patches by Caleb Joseph with slight modifications.
...
Thanks!
2012-04-24 12:57:58 +00:00
bfcdd45245
corrections from an article about using PVS-Studio static checker with blender - http://www.viva64.com/en/b/0145/
2012-04-23 15:54:43 +00:00
5c89138684
style cleanup: comments
2012-04-22 11:54:53 +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
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
44258c3c9a
Fix #30876 , #30932 : crash in material preview render after undo or file load,
...
due to old material copies hanging around in the preview database.
This crash happened pretty randomly, but was especially noticeable when using
node groups.
2012-04-13 12:12:54 +00:00
fe7f354daa
Fix #30900 : when opengl offscreen render failed, the wait cursor would incorrectly
...
stay visible. Patch by Justin Dailey.
2012-04-11 08:27:07 +00:00
79e2cd8fdf
Merged changes in the trunk up to revision 45383.
2012-04-04 00:50:41 +00:00
66e8efd40c
Minor UI messages fix...
2012-04-02 06:56:16 +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
