Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-10-13Merge remote-tracking branch 'origin/master' into blender2.8Dalai Felinto
2016-10-13inform immediate mode when switching OpenGL contextMike Erwin
Longstanding to-do is now to-done. Heinous bug reported by @dfelinto pushed me to fix this.
2016-10-12Fix T49631: radial control operators not using DPI properly.Brecht Van Lommel
2016-10-07Custom Manipulators Core BackendJulian Eisel
This commit lands the core backend of the Custom Manipulators project onto the blender2.8 branch. It is a generic backend for managinig interactive on-screen controls that can be integrated into any 2D or 3D edito. It's also already integrated into the window-manager and editor code where needed. NOTE: The changes here should not be visible for users at all. It's really just a back-end patch. Neither does this include any RNA or Python integration. Of course, there's still lots of work ahead for custom manipulators, but this is a big milestone. WIP code that actually uses this backend can be found in the 'custom-manipulators' branch (previously called 'wiggly-widgets'). The work here isn't completely my own, all the initial work was done by @Antony Riakiotakis (psy-fi) and - although it has changed a lot since them - it's still the same in essence. He definitely deserves a big credit! Some changes in this patch were also done by @Campbell Barton (campbellbarton). Thank you guys! Merge accepted by @brecht and @merwin. Patch: https://developer.blender.org/D2232 Code documentation: https://wiki.blender.org/index.php/Dev:2.8/Source/Custom_Manipulator Main task: https://developer.blender.org/T47343 More info: https://code.blender.org/2015/09/the-custom-manipulator-project-widget-project/
2016-10-03Merge branch 'master' into blender2.8Bastien Montagne
2016-10-03Fix memory leak caused by unknown opeartor of keymap itemJulian Eisel
2016-09-28Fix animation transition in region overlay not working since 4a1feaa5Dalai Felinto
We still have stills with the User Preference window, though.
2016-09-26immediate mode: using texture shader for stereo drawingDalai Felinto
(for side-by-side and top-bottom stereo modes)
2016-09-26Merge branch 'master' into blender2.8Bastien Montagne
WARNING! Full build is broken, alembic has not been merged in correctly and has some references to particle stuff. Don't have time to tackle this now (and probably would be better if someone knowing what he's doing does it anyway). Conflicts: release/scripts/startup/bl_ui/properties_particle.py source/blender/blenkernel/intern/library_remap.c source/blender/blenkernel/intern/smoke.c source/blender/editors/physics/particle_object.c source/blender/editors/physics/physics_intern.h source/blender/editors/physics/physics_ops.c source/blender/editors/space_outliner/outliner_intern.h source/blender/editors/space_view3d/drawvolume.c source/blender/makesrna/intern/rna_smoke.c
2016-09-26Cleanup: stereo windowmanager codeDalai Felinto
This will make the changes in blender2.8 branch simpler
2016-09-23Merge branch 'master' into blender2.8Julian Eisel
Conflicts: intern/ghost/intern/GHOST_ContextCGL.mm intern/ghost/intern/GHOST_WindowCocoa.mm source/blender/makesrna/intern/rna_main.c
2016-09-22immediate mode: Triple Buffer and two new shaders for TEXTURE_2D and ↵Dalai Felinto
TEXTURE_RECT Use the same vertex shader for both fragment shaders
2016-09-19UI Messages: Consistent spelling of term "data-block"Julian Eisel
Was using a bunch of different spellings, mostly "data-block" though, so went with that one (would have been my #1 choice anyway ;) )
2016-09-16Merge branch 'master' into blender2.8Sergey Sharybin
2016-09-15Use temp .blend file copybuffer for pose copy-pasteSergey Sharybin
Uses similar way of storing temp data as object copy paste, just uses different read entrypoint which does not modify current bmain. This gives ability to easily copy-paste poses from one blender to another one. Hopefully doesn't introduce user-measurable differences. Request from Peer here in the studio. Reviewers: mont29 Reviewed By: mont29 Subscribers: hjalti, fsiddi Differential Revision: https://developer.blender.org/D2229
2016-09-12Fix error in --debug-handlers printingJulian Eisel
Was missing else block (and also missing newline character). Caused by e672e7a070e698.
2016-09-11NDOF: allow view movement for modal border and circle select operators.Kai Mach
Reviewed By: brecht Differential Revision: https://developer.blender.org/D2167
2016-09-04Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/blender_particles.cpp source/blender/blenkernel/intern/particle.c source/blender/gpu/intern/gpu_shader.c
2016-09-01Fix crash calling wm.open_mainfile from menu with --debug-memory enabledJulian Eisel
Didn't do any bisecting, but guess it's caused rBb54e95a5c8dcb7 (2.74 is fine, 2.75 isn't). I think this fix makes some other hacks redundant but need to check details (will do when we're back to bcon1 to avoid regressions).
2016-09-01Fix T49199: Combination of dialog + wm.open_mainfile causes crashJulian Eisel
Issue was that the wm.open_mainfile OP caused all handlers to be removed and since rB45592291 cancelled (which is correct in general), the menu that triggered the OP should not be cancelled though. Not sure if this is a nice fix or not, it's however the safest fix I found. A different fix would be to call UI_popup_block_close before WM_operator_call_ex (in dialog_exec_cb), but not sure how safe this is and want to further investigate if it makes other hacks/fixes redundant. There's still a crash with --debug-memory that confused the heck out of me (since I always have --debug-memory enabled), but I'll commit fix for that separately.
2016-08-21Merge branch 'master' into blender2.8Bastien Montagne
In addition to pack of conflicts listed below, also had to comment out particle part of new Alembic code... :/ Conflicts: intern/ghost/intern/GHOST_WindowWin32.cpp source/blender/blenkernel/BKE_effect.h source/blender/blenkernel/BKE_pointcache.h source/blender/blenkernel/intern/cloth.c source/blender/blenkernel/intern/depsgraph.c source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/effect.c source/blender/blenkernel/intern/particle_system.c source/blender/blenkernel/intern/pointcache.c source/blender/blenkernel/intern/rigidbody.c source/blender/blenkernel/intern/smoke.c source/blender/blenkernel/intern/softbody.c source/blender/depsgraph/intern/builder/deg_builder_relations.cc source/blender/gpu/intern/gpu_debug.c source/blender/makesdna/DNA_object_types.h source/blender/makesrna/intern/rna_particle.c
2016-08-19Fix broken keymap loading with disabled ndof - revert part of recent ↵Bastien Montagne
rBb10d0058d72da30 ifdef’ing out defines in DNA/RNA is not a good idea, was breaking alternative keymaps loading from splash screen e.g. (reported by Sergey over IRC, thanks).
2016-08-19OpenGL: don't poll for errors, rely on KHR_debugMike Erwin
Errors are caught & reported by our GL debug callback. This gives us way more useful information than sporadic calls to glGetError. I removed almost all use of glGetError, including our own GPU_ASSERT_NO_GL_ERRORS and GPU_CHECK_ERRORS_AROUND macros. Still used in rna_Image_gl_load because it passes unvalidated input to OpenGL functions. Still used in gpu_state_print_fl_ex as an exception handling hack -- will rewrite this soon. The optimism embodied by this commit will not prevent OpenGL errors. We need to analyze what would cause GL to fail at certain points and proactively intercept these failures. Or guarantee they can't happen.
2016-08-18NDOF: compile 3D mouse code only if WITH_INPUT_NDOFMike Erwin
When WITH_INPUT_NDOF is disabled, 3D mouse handling code is removed from: - GHOST (was mostly done, finished the job) - window manager - various editors - RNA - keymaps The input tab of user prefs does not show 3D mouse settings. Key map editor does not show NDOF mappings. DNA does not change. On my Mac the compiled binary is 42KB smaller after this change. It runs fine WITH_INPUT_NDOF on or off.
2016-08-12Fix T49045: splash not working correctly on OS X, after recent bugfix.Brecht Van Lommel
2016-08-06Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: release/scripts/startup/bl_ui/properties_particle.py release/scripts/startup/bl_ui/properties_physics_cloth.py release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py release/scripts/startup/bl_ui/properties_physics_softbody.py source/blender/blenkernel/BKE_library.h source/blender/blenkernel/BKE_particle.h source/blender/blenkernel/intern/cloth.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/library_query.c source/blender/blenkernel/intern/particle_system.c source/blender/blenkernel/intern/scene.c source/blender/blenkernel/intern/softbody.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/versioning_270.c source/blender/editors/space_file/filesel.c source/blender/editors/space_outliner/outliner_intern.h source/blender/makesdna/DNA_ID.h source/blender/makesdna/DNA_object_force.h source/blender/makesdna/DNA_particle_types.h source/blender/makesrna/intern/rna_particle.c source/blender/makesrna/intern/rna_sculpt_paint.c source/blender/makesrna/intern/rna_smoke.c source/blender/makesrna/intern/rna_space.c
2016-08-06Basic Alembic supportKévin Dietrich
All in all, this patch adds an Alembic importer, an Alembic exporter, and a new CacheFile data block which, for now, wraps around an Alembic archive. This data block is made available through a new modifier ("Mesh Sequence Cache") as well as a new constraint ("Transform Cache") to somewhat properly support respectively geometric and transformation data streaming from alembic caches. A more in-depth documentation is to be found on the wiki, as well as a guide to compile alembic: https://wiki.blender.org/index.php/ User:Kevindietrich/AlembicBasicIo. Many thanks to everyone involved in this little project, and huge shout out to "cgstrive" for the thorough testings with Maya, 3ds Max, Houdini and Realflow as well as @fjuhec, @jensverwiebe and @jasperge for the custom builds and compile fixes. Reviewers: sergey, campbellbarton, mont29 Reviewed By: sergey, campbellbarton, mont29 Differential Revision: https://developer.blender.org/D2060
2016-08-04Fix T47782: popups with wrong size when switching from retina to non-retina ↵Brecht Van Lommel
on OS X.
2016-08-03Fix T48164: messed up interface switching between retina and non-retina ↵Brecht Van Lommel
display on OS X.
2016-07-31Cleanup: spelling, styleCampbell Barton
2016-07-29Remove "debug build only" event printing.Bastien Montagne
This makes no sense since user usually only has release build... And those noisy printings are behind debug flag anyway, so really no reason to only print them out in debug build.
2016-07-28Merge branch 'master' into blender2.8Campbell Barton
2016-07-27Fix T48946: Blender+Tahiti+DRI3+Unity+Linux GUI corruption/not renderingSergey Sharybin
Enable triple buffer by default for AMD cards on opensource driver. Should be safe now, since it was only old cards causing problems, which we don't support now most likely anyway.
2016-07-25Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/BKE_particle.h source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/particle.c
2016-07-19Add 'reload' function to libraries' RNA API.Bastien Montagne
2016-07-18Merge branch 'master' into blender2.8Campbell Barton
2016-07-15Fix py-driver in startup.blend crash in background modeCampbell Barton
Obscure regression in own commit from b34929786. While this could be considered correct, it introduces a crash so disable the update call.
2016-07-12writefile: reuse SDNA between writesCampbell Barton
Avoids decoding the SDNA string every undo step.
2016-07-12Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: intern/cycles/blender/addon/ui.py source/blender/blenkernel/BKE_particle.h source/blender/blenkernel/intern/dynamicpaint.c source/blender/blenkernel/intern/library.c source/blender/blenkernel/intern/object.c source/blender/blenkernel/intern/particle.c source/blender/blenkernel/intern/particle_distribute.c source/blender/blenkernel/intern/texture.c source/blender/editors/object/object_add.c source/blender/editors/object/object_relations.c source/blender/editors/physics/particle_edit.c source/blender/editors/physics/particle_object.c source/blender/editors/transform/transform_snap_object.c
2016-07-11Fix T48812: Brush size invalid with HIDPICampbell Barton
Missed from c5b2f12b
2016-07-07Quiet gcc warning-as-error about non-const pointer passed to const parameter.Bastien Montagne
2016-07-07Fix T48802 Unwrap buttons, can't add hotkey in 3DView's UV Unwrap menu.Bastien Montagne
Those unwrap operators are a bit tricky, some are available from both 3DView and UVEditor, others only from 3DView... Hacked around this by returning Mesh keymap for UV_OT ops for specific 3DView/MeshEditMode context.
2016-07-06Replace of (id->lib != NULL) check by meaningful macro.Bastien Montagne
Idea is to replace hard-to-track (id->lib != NULL) 'is linked datablock' check everywhere in Blender by a macro doing the same thing. This will allow to easily spot those checks in future, and more importantly, to easily change it (see work done in asset-engine branch). Note: did not touch to readfile.c, since there most of the time 'id->lib' check actually concerns the pointer, and not a check whether ID is linked or not. Will have a closer look at it later. Reviewers: campbellbarton, brecht, sergey Differential Revision: https://developer.blender.org/D2082
2016-06-29Merge branch 'master' into blender2.8Bastien Montagne
2016-06-29Cleanup: spelling, indentationCampbell Barton
2016-06-27Merge branch 'master' into blender2.8Bastien Montagne
Conflicts: source/blender/blenkernel/intern/pointcache.c source/blender/makesrna/intern/rna_main_api.c source/blender/makesrna/intern/rna_particle.c
2016-06-25Cleanup: remove bad-level callCampbell Barton
2016-06-25GPU: move select index code out of WMCampbell Barton
This avoids bad-level calls.
2016-06-24BKE_blender: Add own atexit functionsCampbell Barton
Runs before guarded-alloc leaks print.
2016-06-23Dopesheet: Lasso and Circle Select tools work for selecting keyframesJoshua Leung
This only works in the Action and Dopesheet modes (which operate on FCurve keyframes). Support for Grease Pencil and Mask Keyframes though is still pending.