| Age | Commit message (Collapse) | Author |
|---|
|
Conflicts:
intern/cycles/kernel/svm/svm.h
|
|
|
|
|
|
|
|
|
|
|
|
|
|
therefore it is not necessary the NULL check.
|
|
Conflicts:
source/blender/windowmanager/intern/wm_playanim.c
|
|
|
|
Conflicts:
source/blender/editors/object/object_ops.c
|
|
It set default material even if there are a MTface but no blender material.
Tested in GLSL and Multitexture.
Reviewers: HG1
|
|
Blenderplayer forgot to initialize the default material (defmaterail) with function init_def_material().
This reverts also the plumber commit 2fa4a48bcef05671890fafc3fe50a8fa619f0259.
Reviewers: campbellbarton
|
|
|
|
Also add depsgraph & physics
|
|
|
|
Previously we don't merge material cached list, it create dangling pointer and memory leak.
Now we merge material cache list during the scene merge, and remove material in this list during the library free.
Reviewers: agoose77, dfelinto, hg1, pgi, campbellbarton, moguri
Reviewed By: campbellbarton, moguri
Subscribers: campbellbarton, youle, kupoman
Projects: #game_engine
Differential Revision: https://developer.blender.org/D1278
|
|
Conflicts:
source/blender/windowmanager/intern/wm_playanim.c
|
|
I remove duplicate and wrong code which treat the special case of KX_TouchSensor.
And Also the re-conversion of linked logic brick.
|
|
I also removed unused flags in RAS_ListRasterizer.cpp.
|
|
|
|
Conflicts:
source/blender/editors/animation/anim_draw.c
|
|
|
|
|
|
If a mesh doesn't have a material we don't initialize the mSavedData in KX_BlenderMaterial to avoid crash.
|
|
Conflicts:
build_files/scons/tools/Blender.py
source/blender/blenkernel/intern/mesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenkernel/intern/particle_system.c
source/blender/editors/interface/interface_handlers.c
|
|
The XYZ translation lock was missing for dynamic object.
Reviewed By: panzergame
|
|
The actual character motion actuator triggers every frame the jump method.
Adding an edge detection to trigger the jump method.
Reviewers: lordloki, sybren, moguri
Reviewed By: moguri
Differential Revision: https://developer.blender.org/D1220
|
|
* Cleanup duplicated code.
* Remove unnecessary "this->"
Reviewers: kupoman, lordloki
Reviewed By: kupoman, lordloki
Differential Revision: https://developer.blender.org/D1293
|
|
|
|
Most of this patch was created by Daniel Stokes, I'm mostly just cleaning
it up and testing it. Still todo: hardness. I need to figure out how to
handle the integer -> float conversion on a dynamic uniform.
Reviewers: psy-fi, brecht
Reviewed By: psy-fi
Subscribers: psy-fi
Differential Revision: https://developer.blender.org/D511
|
|
Currently we can't update the physics mesh of an added rigid body.
The cause is that that we need to update all shapes to say that the mesh was changed, for static object we don't do that previously because we use a odd way to reallocate memory at the same place.
So now when a mesh is changed we iterate all physics controllers which use the same shape info and recreate its shape with the correct mesh.
example file : {F168100}
Reviewers: scorpion81, sergof, hg1, sybren, moguri, agoose77
Reviewed By: moguri, agoose77
Subscribers: sybren
Differential Revision: https://developer.blender.org/D1269
|
|
rendering
Make scene background color as default for render-to-texture instead of
current blue color (0, 0, 255).
It is very useful for mirrors setups.
Reviewers: moguri, ben2610, sybren, panzergame, hg1
Reviewed By: panzergame, hg1, moguri
Subscribers: mpan3
Differential Revision: https://developer.blender.org/D1287
|
|
eb81153896 broke the fix for T38335, and this fix was incomplete, now we iterate by triangles and polys in the same while block.
|
|
|
|
Previously we forgot to do a special operation for indexes to convert a quad to two triangles.
|
|
"if (value == true)" -> "if(value)"
"if (ptr == NULL)" -> "if (!ptr)"
"vector<bool>" -> "std::vector<bool>"
And other blender typo.
|
|
|
|
I have added an optional named "index" argument for methode get/setUV, I have also modified the and set to deprecated methodes setUV2 and getUV2 : the doc was wrong and the methode can't be called anyway because it declared as VARARG in the .h and convert directly the args value to a vector in the .cpp.
Reviewers: sybren, lordloki, hg1
Reviewed By: lordloki, hg1
Subscribers: agoose77
Differential Revision: https://developer.blender.org/D1240
|
|
Conflicts:
source/blender/editors/object/object_shapekey.c
|
|
|
|
It fix some mistakes in b5e96530353ef22d184a60cd2b59a5e451ee211f and made a more safety behavior for collision callbacks used in compound controllers during adding and removing.
|
|
EnableCcdPhysicsController in CcdPhysicsEnvironment
Replace EnableCcdPhysicsController by AddCcdPhysicsController and DisableCcdPhysicsController by RemoveCcdPhysicsController.
Tested with compound shapes and collision sensors.
Reviewers:agoose77, ideasman42
|
|
Conflicts:
source/blender/editors/space_sequencer/sequencer_draw.c
|
|
This commit is a little cleanup for whitspaces, braces, spaces around operators and useless keywords struct/class.
Reviewers:sybren
|
|
|
|
The implementation of this 'ghost' argument already existed in the C++
source, but wasn't exposed to Python yet.
|
|
The assert message was caused by the multi call of BLO_library_append_begin in KX_BlenderSceneConverter::LinkBlendFile.
|
|
Conflicts:
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_sync.h
source/blender/editors/interface/interface_utils.c
|
|
|
